From e0659e02ba6774909d4bd95546b8e90572d45c5e Mon Sep 17 00:00:00 2001 From: Fuxing Loh Date: Thu, 15 Apr 2021 01:03:18 +0800 Subject: [PATCH] api-core to use named export instead of * --- .../__tests__/category/blockchain.test.ts | 6 +++--- packages/jellyfish-api-core/__tests__/index.test.ts | 4 ++-- packages/jellyfish-api-core/src/index.ts | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/jellyfish-api-core/__tests__/category/blockchain.test.ts b/packages/jellyfish-api-core/__tests__/category/blockchain.test.ts index de0a71dce3..ef00bc6b16 100644 --- a/packages/jellyfish-api-core/__tests__/category/blockchain.test.ts +++ b/packages/jellyfish-api-core/__tests__/category/blockchain.test.ts @@ -1,7 +1,7 @@ import { RegTestContainer, MasterNodeRegTestContainer } from '@defichain/testcontainers' import { ContainerAdapterClient } from '../container_adapter_client' import waitForExpect from 'wait-for-expect' -import { BigNumber, Block, Transaction } from '../../src' +import { BigNumber, blockchain as bc } from '../../src' describe('non masternode', () => { const container = new RegTestContainer() @@ -103,7 +103,7 @@ describe('masternode', () => { it('should getBlock with verbosity 1 and return block with tx as hex', async () => { const blockHash = await waitForBlockHash(1) - const block: Block = await client.blockchain.getBlock(blockHash, 1) + const block: bc.Block = await client.blockchain.getBlock(blockHash, 1) expect(block.hash.length).toBe(64) @@ -139,7 +139,7 @@ describe('masternode', () => { it('should getBlock with verbosity 2 and return block with tx as RawText', async () => { const blockHash = await waitForBlockHash(1) - const block: Block = await client.blockchain.getBlock(blockHash, 2) + const block: bc.Block = await client.blockchain.getBlock(blockHash, 2) expect(block.tx.length).toBeGreaterThanOrEqual(1) expect(block.tx[0].vin[0].coinbase).toStrictEqual('5100') diff --git a/packages/jellyfish-api-core/__tests__/index.test.ts b/packages/jellyfish-api-core/__tests__/index.test.ts index 9d3e7c782a..291be03f38 100644 --- a/packages/jellyfish-api-core/__tests__/index.test.ts +++ b/packages/jellyfish-api-core/__tests__/index.test.ts @@ -1,4 +1,4 @@ -import { MintingInfo, ApiClient, ClientApiError } from '../src' +import { mining, ApiClient, ClientApiError } from '../src' import { ContainerAdapterClient } from './container_adapter_client' import { RegTestContainer } from '@defichain/testcontainers' @@ -17,7 +17,7 @@ it('should export client', async () => { it('should export categories', async () => { const client = new TestClient() await expect(async () => { - const info: MintingInfo = await client.mining.getMintingInfo() + const info: mining.MintingInfo = await client.mining.getMintingInfo() console.log(info) }).rejects.toThrowError(ClientApiError) }) diff --git a/packages/jellyfish-api-core/src/index.ts b/packages/jellyfish-api-core/src/index.ts index 4e3d5b29c0..7a944c5add 100644 --- a/packages/jellyfish-api-core/src/index.ts +++ b/packages/jellyfish-api-core/src/index.ts @@ -4,9 +4,9 @@ import { Mining } from './category/mining' import { Wallet } from './category/wallet' export * from '@defichain/jellyfish-json' -export * from './category/blockchain' -export * from './category/mining' -export * from './category/wallet' +export * as blockchain from './category/blockchain' +export * as mining from './category/mining' +export * as wallet from './category/wallet' /** * ApiClient; a protocol agnostic DeFiChain node client, RPC calls are separated into their category.