diff --git a/v2/packages/client/__tests__/client-fetching.test.ts b/v2/packages/client/__tests__/client-fetching.test.ts index 14a9029a6..6b57ba590 100644 --- a/v2/packages/client/__tests__/client-fetching.test.ts +++ b/v2/packages/client/__tests__/client-fetching.test.ts @@ -7,6 +7,7 @@ describe('Test client', () => { let client: ChainRegistryClient; beforeAll(() => { const options: ChainRegistryClientOptions = { + // add camelCase chainNames: ['osmosis'] }; diff --git a/v2/packages/client/__tests__/client.api.test.ts b/v2/packages/client/__tests__/client.api.test.ts index 441d83321..552dc180e 100644 --- a/v2/packages/client/__tests__/client.api.test.ts +++ b/v2/packages/client/__tests__/client.api.test.ts @@ -1,11 +1,10 @@ -import { assetLists as _assetLists, chains } from '@chain-registry/v2'; - import { ChainRegistryChainUtil, ChainRegistryChainUtilOptions, ChainRegistryClient, ChainRegistryClientOptions } from '../src'; +import { assetLists as _assetLists, chains } from '../test-utils'; describe('tests for asset-list-util', () => { const assetLists = _assetLists.filter( @@ -84,7 +83,7 @@ describe('tests for asset-list-util', () => { it('getAssetNameByDenom', () => { const name = client.getAssetNameByDenom('uion'); - expect(name).toEqual('Ion DAO'); + expect(name).toEqual('Ion'); }); it('getChainNameByDenom', () => { diff --git a/v2/packages/client/setup-jest.ts b/v2/packages/client/setup-jest.ts index 7ceff8807..a2d065315 100644 --- a/v2/packages/client/setup-jest.ts +++ b/v2/packages/client/setup-jest.ts @@ -1,6 +1,6 @@ import nock from 'nock'; -import { assets, chains, ibc } from './test-utils'; +import { assetLists, chains, ibc } from './test-utils'; const baseUrl = 'https://raw.githubusercontent.com'; @@ -14,35 +14,35 @@ beforeAll(() => { // 'https://raw.githubusercontent.com/cosmos/chain-registry/master/_IBC/osmosis-secretnetwork.json' nock(baseUrl) .get('/cosmos/chain-registry/master/osmosis/chain.json') - .reply(200, chains.find(c => c.chain_name === 'osmosis')); + .reply(200, chains.find(c => c.chainName === 'osmosis')); nock(baseUrl) .get('/cosmos/chain-registry/master/osmosis/assetlist.json') - .reply(200, assets.find(c => c.chain_name === 'osmosis')); + .reply(200, assetLists.find(c => c.chainName === 'osmosis')); nock(baseUrl) .get('/cosmos/chain-registry/master/stargaze/chain.json') - .reply(200, chains.find(c => c.chain_name === 'stargaze')); + .reply(200, chains.find(c => c.chainName === 'stargaze')); nock(baseUrl) .get('/cosmos/chain-registry/master/stargaze/assetlist.json') - .reply(200, assets.find(c => c.chain_name === 'stargaze')); + .reply(200, assetLists.find(c => c.chainName === 'stargaze')); nock(baseUrl) .get('/cosmos/chain-registry/master/juno/chain.json') - .reply(200, chains.find(c => c.chain_name === 'juno')); + .reply(200, chains.find(c => c.chainName === 'juno')); nock(baseUrl) .get('/cosmos/chain-registry/master/juno/assetlist.json') - .reply(200, assets.find(c => c.chain_name === 'juno')); + .reply(200, assetLists.find(c => c.chainName === 'juno')); nock(baseUrl) .get('/cosmos/chain-registry/master/secretnetwork/assetlist.json') - .reply(200, assets.find(c => c.chain_name === 'secretnetwork')); + .reply(200, assetLists.find(c => c.chainName === 'secretnetwork')); nock(baseUrl) .get('/cosmos/chain-registry/master/_IBC/juno-osmosis.json') - .reply(200, ibc.find(i => i.chain_1.chain_name === 'juno' && i.chain_2.chain_name==='osmosis')); + .reply(200, ibc.find(i => i.chain1.chainName === 'juno' && i.chain2.chainName==='osmosis')); nock(baseUrl) .get('/cosmos/chain-registry/master/_IBC/osmosis-secretnetwork.json') - .reply(200, ibc.find(i => i.chain_1.chain_name === 'osmosis' && i.chain_2.chain_name==='secretnetwork')); + .reply(200, ibc.find(i => i.chain1.chainName === 'osmosis' && i.chain2.chainName==='secretnetwork')); }); diff --git a/v2/packages/client/src/fetcher.ts b/v2/packages/client/src/fetcher.ts index a941b7bc9..a0c773c2b 100644 --- a/v2/packages/client/src/fetcher.ts +++ b/v2/packages/client/src/fetcher.ts @@ -1,4 +1,3 @@ -import { AssetList as IAssetList, Chain as IChain, IBCData as IIBCData} from '@chain-registry/interfaces'; import { AssetList, Chain, @@ -107,11 +106,11 @@ export class ChainRegistryFetcher { return chainInfo; } - upsertChain(data: IChain) { + upsertChain(data: Chain) { const found = this._chains.find((chain) => { return ( - chain.chainName === data.chain_name && - chain.networkType === data.network_type + chain.chainName === data.chainName && + chain.networkType === data.networkType ); }); @@ -124,8 +123,8 @@ export class ChainRegistryFetcher { this._chains = this._chains.map((chain) => { if ( - chain.chainName === data.chain_name && - chain.networkType === data.network_type + chain.chainName === data.chainName && + chain.networkType === data.networkType ) { return convertedData; } else { @@ -134,9 +133,9 @@ export class ChainRegistryFetcher { }); } - updateAssetList(data: IAssetList) { + updateAssetList(data: AssetList) { const found = this._assetLists.find((list) => { - return list.chainName === data.chain_name; + return list.chainName === data.chainName; }); const convertedData: AssetList = keysToCamel(data); @@ -147,7 +146,7 @@ export class ChainRegistryFetcher { } this._assetLists = this._assetLists.map((list) => { - if (list.chainName === data.chain_name) { + if (list.chainName === data.chainName) { return convertedData; } else { return list; @@ -155,11 +154,11 @@ export class ChainRegistryFetcher { }); } - upsertIbcData(data: IIBCData) { + upsertIbcData(data: IBCData) { const found = this._ibcData.find((info) => { return ( - info.chain1.chainName === data.chain_1.chain_name && - info.chain2.chainName === data.chain_2.chain_name + info.chain1.chainName === data.chain1.chainName && + info.chain2.chainName === data.chain2.chainName ); }); @@ -172,8 +171,8 @@ export class ChainRegistryFetcher { this._ibcData = this._ibcData.map((info) => { if ( - info.chain1.chainName === data.chain_1.chain_name && - info.chain2.chainName === data.chain_2.chain_name + info.chain1.chainName === data.chain1.chainName && + info.chain2.chainName === data.chain2.chainName ) { return convertedData; } else { @@ -182,18 +181,18 @@ export class ChainRegistryFetcher { }); } - update(data: IChain | IAssetList | IIBCData) { + update(data: Chain | AssetList | IBCData) { if (!data.$schema) throw new Error('not a registered JSON schema type'); const type = basename(data.$schema, '.schema.json'); switch (type) { case 'chain': - this.upsertChain(data as IChain); + this.upsertChain(data as Chain); break; case 'assetlist': - this.updateAssetList(data as IAssetList); + this.updateAssetList(data as AssetList); break; case 'ibc_data': - this.upsertIbcData(data as IIBCData); + this.upsertIbcData(data as IBCData); break; default: throw new Error('unknown schema type');