refactor: use common package (#80)

Author: eng-cc

packages/skchain/package.json

@@ -30,6 +30,7 @@
     "@libp2p/interface-peer-id": "^2.0.1",
     "@libp2p/interface-pubsub": "^3.0.7",
     "@libp2p/peer-id-factory": "^2.0.3",
+    "@trustack/common": "workspace:^1.0.0",
     "@trustack/network": "workspace:^1.0.0",
     "abstract-level": "^1.0.3",
     "bitset": "^5.1.1",

packages/skchain/src/index.mts

@@ -1,5 +1,5 @@
 export { genetateDid } from './lib/p2p/did.js';
-export type { DidJson } from './lib/p2p/did.js';
+export type { DidJson } from '@trustack/common';
 export { evalFunction } from './lib/contract/vm.js';
 
 export { SKChain } from './skChain.js';

packages/skchain/src/lib/consensus/__tests__/consensusTest.util.ts

@@ -1,7 +1,7 @@
-import { testAccounts } from '../../../../tests/testAccount.js';
+import type { DidJson } from '@trustack/common';
+import { testAccounts } from '@trustack/common';
 import type { BlockService } from '../../ipld/blockService/blockService.js';
 import { createTestBlockService } from '../../ipld/blockService/__tests__/blockService.util.js';
-import type { DidJson } from '../../p2p/did.js';
 import type { Skfs } from '../../skfs/index.js';
 import { SkNetwork } from '../../skfs/network.js';
 import {

packages/skchain/src/lib/consensus/__tests__/nodeCollects.spec.ts

@@ -1,6 +1,5 @@
-import { sleep } from '../../../../tests/skchainTest.util.js';
+import { wait } from '@trustack/common';
 import { NETWORK_GET_NODE_COUNT_INTERVAL } from '../../../config/index.js';
-import { genetateDid } from '../../p2p/did.js';
 import type { NodeCollect } from '../nodeCollect.js';
 import { createTestNodeCollect } from './consensusTest.util.js';
 
@@ -9,7 +8,7 @@ describe('Sknetwork', () => {
     it('should nodeCollect init ok', async () => {
       const { nodeCollect, close } = await createTestNodeCollect();
       await nodeCollect.init();
-      await sleep(NETWORK_GET_NODE_COUNT_INTERVAL * 2.1);
+      await wait(NETWORK_GET_NODE_COUNT_INTERVAL * 2.1);
       await close();
     }, 100000);
     // TODO fix this test

packages/skchain/src/lib/contract/__tests__/contract.spec.ts

@@ -1,6 +1,6 @@
 import { BUILDER_NAMES } from '@faithstack/contract';
 import { bytes } from 'multiformats';
-import { testAccounts } from '../../../../tests/testAccount.js';
+import { testAccounts } from '@trustack/common';
 import { Address } from '../../../mate/address.js';
 import { Contract } from '../index.js';
 import { testCoinContract } from './contractTest.util.js';

packages/skchain/src/lib/contract/__tests__/vm.spec.ts

@@ -1,4 +1,4 @@
-import { testAccounts } from '../../../../tests/testAccount.js';
+import { testAccounts } from '@trustack/common';
 import { Address } from '../../../mate/address.js';
 import { generateBaseContractCode } from '../codeSnippet.js';
 import { evalClass, evalFunction } from '../vm.js';

packages/skchain/src/lib/genesis/__tests__/genesis.spec.ts

@@ -1,4 +1,4 @@
-import { testAccounts } from '../../../../tests/testAccount.js';
+import { testAccounts } from '@trustack/common';
 import { createTestBlockService } from '../../ipld/blockService/__tests__/blockService.util.js';
 import { chainState } from '../../state/index.js';
 import { genInitOption } from '../../state/initOption.js';

packages/skchain/src/lib/ipld/blockService/__tests__/accountCache.spec.ts

@@ -1,4 +1,4 @@
-import { testAccounts } from '../../../../../tests/testAccount.js';
+import { testAccounts } from '@trustack/common';
 import { newAccount } from '../../../../mate/account.js';
 import { createEmptyStorageRoot } from '../../../../mate/utils.js';
 import { AccountCache } from '../accountCache.js';

packages/skchain/src/lib/p2p/did.ts

@@ -13,11 +13,7 @@ import { base58btc } from 'multiformats/bases/base58';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
 import * as lsm from 'libsodium-wrappers-sumo';
 const { randomBytes, secretbox } = nacl;
-export interface DidJson {
-  id: string; // sk did
-  pubKey?: string; // libp2p
-  privKey: string; // libp2p
-}
+import type { DidJson } from '@trustack/common';
 
 // https://libsodium.gitbook.io/doc/advanced/ed25519-curve25519
 // https://github.com/paulmillr/noble-ed25519#getsharedsecretprivatekey-publickey

packages/skchain/src/lib/skfs/__tests__/network.spec.ts

@@ -1,6 +1,5 @@
 import { bytes } from 'multiformats';
-import { sleep } from '../../../../tests/skchainTest.util.js';
-import { testAccounts } from '../../../../tests/testAccount.js';
+import { testAccounts, wait } from '@trustack/common';
 import { PubsubTopic } from '../network.js';
 import { connect2Network, createTestSkNetWork } from './utils.js';
 
@@ -40,12 +39,12 @@ describe('Sknetwork', () => {
       await connect2Network(n1, n2);
       await connect2Network(n2, n3);
 
-      await sleep(500);
+      await wait(500);
 
       await n1.publish(PubsubTopic.DID, bytes.fromString('hello'));
-      await sleep(300);
+      await wait(300);
       await n2.publish(PubsubTopic.DID, bytes.fromString('world'));
-      await sleep(2000);
+      await wait(2000);
 
       expect(msg1).toBe('world');
       expect(msg2).toBe('hello');
@@ -72,7 +71,7 @@ describe('Sknetwork', () => {
       expect(conn1.stat.status === 'OPEN').toBeTruthy();
       await conn1.close();
       await c2();
-      await sleep(1000);
+      await wait(1000);
       let conn2Error = false;
       try {
         await n1.network.node.dial(n2.network.node.peerId);

packages/skchain/src/lib/skfs/__tests__/skfs_bitswap.spec.ts

@@ -1,5 +1,5 @@
 import { bytes } from 'multiformats';
-import { testAccounts } from '../../../../tests/testAccount.js';
+import { testAccounts } from '@trustack/common';
 import { createCborBlock, takeBlockValue } from '../../../mate/utils.js';
 import { testDid } from '../../../mate/__tests__/metaTest.util.js';
 import { connect2Network, createTestSkNetWork } from './utils.js';

packages/skchain/src/lib/skfs/__tests__/utils.ts

@@ -1,4 +1,4 @@
-import type { DidJson } from '../../p2p/did.js';
+import type { DidJson } from '@trustack/common';
 import { Skfs, leveldb_prefix } from '../index.js';
 import { Mpt } from '../mpt.js';
 import { SkNetwork } from '../network.js';

packages/skchain/src/lib/skfs/network.ts

@@ -1,7 +1,7 @@
 import { Network, createConfig } from '@trustack/network';
 import type { LevelDatastore } from 'datastore-level';
 import type { Message } from '@libp2p/interface-pubsub';
-import type { DidJson } from '../p2p/did.js';
+import type { DidJson } from '@trustack/common';
 import { createPeerIdFromDidJson } from '../p2p/did.js';
 
 export enum PubsubTopic {

packages/skchain/src/lib/transaction/__tests__/trans.spec.ts

@@ -1,6 +1,5 @@
 import { bytes } from 'multiformats';
-import { sleep } from '../../../../tests/skchainTest.util.js';
-import { testAccounts } from '../../../../tests/testAccount.js';
+import { testAccounts, wait } from '@trustack/common';
 import { Address } from '../../../mate/address.js';
 import { testCoinContract } from '../../contract/__tests__/contractTest.util.js';
 import { TransStatus } from '../index.js';
@@ -44,7 +43,7 @@ describe('transcation', () => {
         payload: bytes.fromString(testCoinContract),
       });
       expect(trans).not.toEqual(undefined);
-      await sleep(8000);
+      await wait(8000);
       if (!trans) {
         throw new Error('no trans');
       } else {

packages/skchain/src/lib/transaction/__tests__/transTest.util.ts

@@ -1,9 +1,9 @@
+import type { DidJson } from '@trustack/common';
 import { newAccount } from '../../../mate/account.js';
 import { createEmptyStorageRoot } from '../../../mate/utils.js';
 import { createTestConsensus } from '../../consensus/__tests__/consensusTest.util.js';
 import { skCacheKeys } from '../../skfs/key.js';
 import { createTestBlockService } from '../../ipld/blockService/__tests__/blockService.util.js';
-import type { DidJson } from '../../p2p/did.js';
 import { TransactionAction } from '../index.js';
 
 export const createTestTransAction = async (

packages/skchain/src/mate/__tests__/metaTest.util.ts

@@ -1,4 +1,4 @@
-import { testAccounts } from '../../../tests/testAccount.js';
+import { testAccounts } from '@trustack/common';
 import { genesis } from '../../config/testnet.config.js';
 import { BloomFilter } from '../../lib/ipld/logsBloom/bloomFilter.js';
 import { signById } from '../../lib/p2p/did.js';

packages/skchain/src/skChain.ts

@@ -1,11 +1,11 @@
+import type { DidJson } from '@trustack/common';
 import { LifecycleStap } from './lib/state/lifecycle.js';
 import type { GenesisConfig } from './config/types.js';
 import { chainState } from './lib/state/index.js';
 import { version } from './config/index.js';
 import { TransactionAction } from './lib/transaction/index.js';
 import { message } from './utils/message.js';
 import { skCacheKeys } from './lib/skfs/key.js';
-import type { DidJson } from './lib/p2p/did.js';
 import { genetateDid } from './lib/p2p/did.js';
 import { Consensus } from './lib/consensus/index.js';
 import { logClassPerformance } from './utils/performance.js';

packages/skchain/src/utils/__tests__/performance.spec.ts

@@ -1,5 +1,5 @@
+import { wait } from '@trustack/common';
 import { bytes } from 'multiformats';
-import { sleep } from '../../../tests/skchainTest.util.js';
 import {
   logClassPerformance,
   logPerformance,
@@ -19,7 +19,7 @@ class testClass {
     return bytes.fromString(this.str);
   }
   async timer() {
-    await sleep(1100);
+    await wait(1100);
   }
 
   @logPerformance

packages/skchain/tests/node.spec.ts

@@ -1,6 +1,6 @@
+import { testAccounts } from '@trustack/common';
 import { performanceCollecter } from '../src/utils/performance.js';
 import { createTestSkChain } from './skchainTest.util.js';
-import { testAccounts } from './testAccount.js';
 
 describe('SkChain', () => {
   describe('test', () => {

packages/skchain/tests/skchainTest.util.ts

@@ -26,11 +26,3 @@ export const createTestSkChain = async (
 
   return chain;
 };
-
-export const sleep = async (timeout: number): Promise<boolean> => {
-  return new Promise((reslove) => {
-    setTimeout(() => {
-      reslove(true);
-    }, timeout);
-  });
-};

packages/skchain/tests/testAccount.ts

@@ -1,10 +1,10 @@
+import { testAccounts, wait } from '@trustack/common';
 import { bytes } from 'multiformats';
 import { testCoinContract } from '../src/lib/contract/__tests__/contractTest.util.js';
 import { TransStatus } from '../src/lib/transaction/index.js';
 import { Address } from '../src/mate/address.js';
 import { performanceCollecter } from '../src/utils/performance.js';
-import { createTestSkChain, sleep } from './skchainTest.util.js';
-import { testAccounts } from './testAccount.js';
+import { createTestSkChain } from './skchainTest.util.js';
 
 describe('SkChain transaction', () => {
   describe('single node test', () => {
@@ -21,7 +21,7 @@ describe('SkChain transaction', () => {
         expect(status.status).toEqual(TransStatus.waiting);
       }
       // wait to stack
-      await sleep(8000);
+      await wait(8000);
       expect(trans).not.toEqual(undefined);
       if (trans) {
         const status = await chain.transAction.transStatus(trans.hash);
@@ -45,7 +45,7 @@ describe('SkChain transaction', () => {
         throw new Error('no trans');
       }
       // wait to stack
-      await sleep(12000);
+      await wait(12000);
       const status = await chain.transAction.transStatus(trans.hash);
       expect(status.status).toEqual(TransStatus.transed);
       let account = await chain.getAccount(trans.recipient.did);
@@ -75,7 +75,7 @@ describe('SkChain transaction', () => {
       if (!trans2) {
         throw new Error('no trans2');
       }
-      await sleep(10000);
+      await wait(10000);
       account = await chain.getAccount(trans.recipient.did);
       if (!account) {
         throw new Error('no contract account');
@@ -113,7 +113,7 @@ describe('SkChain transaction', () => {
       if (!trans2) {
         throw new Error('no trans2');
       }
-      await sleep(15000);
+      await wait(15000);
       const account = await chain.getAccount(trans.recipient.did);
       if (!account) {
         throw new Error('no contract account');