Fix test (#51)

Author: hundredark

src/client/user.ts

@@ -27,7 +27,7 @@ export const UserKeystoreClient = (axiosInstance: AxiosInstance) => ({
   fetchList: (userIDs: string[]) => axiosInstance.post<unknown, UserResponse[]>(`/users/fetch`, userIDs),
 
   // Create a network user, can be created by bot only with no permission
-  createBareUser: (fullName: string, sessionSecret: string) => axiosInstance.post<UserResponse>('/users', { full_name: fullName, session_secret: sessionSecret }),
+  createBareUser: (fullName: string, sessionSecret: string) => axiosInstance.post<unknown, UserResponse>('/users', { full_name: fullName, session_secret: sessionSecret }),
 
   // Modify current user's personal name and avatar
   update: (fullName: string, avatarBase64: string) => axiosInstance.post<unknown, UserResponse>(`/me`, { full_name: fullName, avatar_base64: avatarBase64 }),

test/address.test.ts

@@ -1,27 +1,27 @@
-import { client } from './common';
+import { client, keystore } from './common';
 
 describe('address', () => {
   const asset_id = '43d61dcd-e413-450d-80b8-101d5e903357';
   const destination = '0xF2e6D6BB9E6D31B873bC23649A25A76f8852e3f5';
   let tmpAddressID = '';
 
   it('create address if not exsits', async () => {
-    const receive = await client.createAddress({ asset_id, destination, label: 'test' }, '12345');
+    const receive = await client.address.create(keystore.pin, { asset_id, destination, label: 'test' });
     console.log(receive);
-    const res = await client.readAddress(receive.address_id);
+    const res = await client.address.fetch(receive.address_id);
     expect(res.address_id).toEqual(receive.address_id);
     tmpAddressID = receive.address_id;
   });
   it('read addresses', async () => {
-    const list = await client.readAddresses(asset_id);
+    const list = await client.address.fetchList(asset_id);
     const isHave = list.some(item => item.address_id === tmpAddressID);
     expect(isHave).toBeTruthy();
   });
 
   it('delete address', async () => {
-    const res = await client.readAddress(tmpAddressID);
+    const res = await client.address.fetch(tmpAddressID);
     expect(res.address_id).toEqual(tmpAddressID);
-    const t = await client.deleteAddress(tmpAddressID);
+    const t = await client.address.delete(keystore.pin, tmpAddressID);
     expect(t).toBeUndefined();
   });
 });

test/common.ts

@@ -1,6 +1,17 @@
-import { Client } from '../src';
-import fs from 'fs';
-const keystore = JSON.parse(fs.readFileSync(__dirname + '/../config.json', 'utf8'));
-const client = new Client(keystore);
+import { MixinApi } from '../src';
+import keystore from './keystore';
 
-export { client };
+const config = {
+  requestConfig: {
+    responseCallback: (err: any) => {
+      console.log(err);
+    }
+  },
+  keystore
+};
+const client = MixinApi(config);
+
+export {
+  client ,
+  keystore
+};

test/mixin/keystore.ts.example renamed to test/keystore.ts

@@ -1,6 +1,6 @@
 import User from '../../src/client/user';
 import Pin from '../../src/client/pin';
-import keystore from './keystore';
+import keystore from '../keystore';
 
 describe('Tests for users', () => {
   const user = User({ keystore });

test/mixin/user.test.ts

@@ -1,9 +1,11 @@
+// @ts-ignore
 import forge from 'node-forge';
+import { v4 as uuid } from 'uuid';
 import { signAuthenticationToken } from '../../src/client/utils/auth';
 import { base64RawURLEncode, base64RawURLDecode } from '../../src/client/utils/base64';
 import { hashMembers, uniqueConversationID } from '../../src/client/utils/uniq';
 import { sharedEd25519Key, signEd25519PIN } from '../../src/client/utils/pin';
-import keystore from './keystore';
+import keystore from '../keystore';
 
 describe('Tests for utils', () => {
   test('base64 encode & decode should be url safe', () => {
@@ -74,8 +76,7 @@ describe('Tests for utils', () => {
   });
 
   test('tests for auth', () => {
-    expect(signAuthenticationToken('GET', '/me', '', undefined)).toBe('');
-    expect(signAuthenticationToken('GET', '/me', '', keystore)).not.toBe('');
-    expect(signAuthenticationToken('POST', '/me', {foo: 'bar'}, keystore)).not.toBe('');
+    expect(signAuthenticationToken('GET', '/me', '', uuid(), keystore)).not.toBe('');
+    expect(signAuthenticationToken('POST', '/me', {foo: 'bar'}, uuid(), keystore)).not.toBe('');
   });
 });

test/mixin/utils.test.ts

@@ -1,36 +1,31 @@
-import Registry, { Blank, MVMTestnet } from '../../src/mvm/registry';
+import Registry from '../../src/mvm/registry';
+import { BlankAddress, MVMTestnet } from '../../src';
 
 describe('Tests for registry', () => {
   const registry = new Registry({ address: MVMTestnet.Registry.Address, uri: MVMTestnet.RPCUri});
 
   test('Test for fetch mvm address of mixin asset', async () => {
-    const address = await registry.fetchAssetAddress('965e5c6e-434c-3fa9-b780-c50f43cd955c');
-    expect(address).toMatch('0x155bDfAb24f07630C27a3F31634B33F94eC4A634');
+    const address = await registry.fetchAssetContract('965e5c6e-434c-3fa9-b780-c50f43cd955c');
+    expect(address).toMatch('0x9896c802e143A59A98c0C26bBa6d11C1AAF4A023');
   });
 
   test('Test for fetch invalid mvm address of mixin asset', async () => {
-    const address = await registry.fetchAssetAddress('e9e5b807-fa8b-455a-8dfa-b189d28310ff');
-    expect(address).toMatch(Blank);
+    const address = await registry.fetchAssetContract('e9e5b807-fa8b-455a-8dfa-b189d28310ff');
+    expect(address).toMatch(BlankAddress);
   });
 
-  test('Test for fetch mvm address of mixin user', async () => {
-    const address = await registry.fetchUsersAddress(['e9e5b807-fa8b-455a-8dfa-b189d28310ff'], 1);
-    expect(address).toMatch('0x8a9f2B6492A3E24B1D2b92ad29E80549Be6B21Cc');
-  });
-
-  test('Test for fetch mvm address of a mixin user without threshold', async () => {
-    const address = await registry.fetchUserAddress('e9e5b807-fa8b-455a-8dfa-b189d28310ff');
-    expect(address).toMatch('0x8a9f2B6492A3E24B1D2b92ad29E80549Be6B21Cc');
+  test('Test for fetch invalid mvm address of mixin user', async () => {
+    const address = await registry.fetchUsersContract(['965e5c6e-434c-3fa9-b780-c50f43cd955c'], 1);
+    expect(address).toMatch(BlankAddress);
   });
 
-  test('Test for fetch invalid mvm address of mixin user', async () => {
-    const address = await registry.fetchUsersAddress(['965e5c6e-434c-3fa9-b780-c50f43cd955c'], 1);
-    expect(address).toMatch(Blank);
+  test('Test for fetch mvm address of mixin user', async () => {
+    const address = await registry.fetchUsersContract(['e9e5b807-fa8b-455a-8dfa-b189d28310ff'], 1);
+    expect(address).toMatch('0xc09516323c601006DbaDb330778fADCE08593252');
   });
 
-  test('Test for default registry', async () => {
-    const defaultRegistry = new Registry({});
-    const address = await defaultRegistry.fetchAssetAddress('965e5c6e-434c-3fa9-b780-c50f43cd955c');
-    expect(address).toMatch('0x155bDfAb24f07630C27a3F31634B33F94eC4A634');
+  test('Test for fetch mvm address of a mixin user without threshold', async () => {
+    const address = await registry.fetchUserContract('e9e5b807-fa8b-455a-8dfa-b189d28310ff');
+    expect(address).toMatch('0xc09516323c601006DbaDb330778fADCE08593252');
   });
 });

test/mvm/registry.test.ts

@@ -1,18 +1,23 @@
-import { client } from './common';
 import { v4 as uuid } from 'uuid';
+import { client } from './common';
+import { MintAssetID, MintMinimumCost, GroupMembers, GroupThreshold } from '../src/client/collectible';
+import { buildMintCollectibleMemo } from '../src';
 
 describe('address', () => {
   it('create nft', async () => {
     const id = uuid();
-
-    const tr = client.newMintCollectibleTransferInput({
+    const tr = {
+      asset_id: MintAssetID,
+      amount: MintMinimumCost,
       trace_id: id,
-      collection_id: id,
-      token_id: id,
-      content: 'test',
-    });
+      memo: buildMintCollectibleMemo(id, id, 'test'),
+      opponent_multisig: {
+        receivers: GroupMembers,
+        threshold: GroupThreshold
+      }
+    };
 
-    const payment = await client.verifyPayment(tr);
+    const payment = await client.payment.request(tr);
     console.log('mint collectibles', id, `mixin://codes/${payment.code_id}`);
     expect(payment.trace_id).toEqual(id);
   });

test/nft.test.ts

@@ -1,49 +1,28 @@
-import { client } from './common';
+import { client, keystore } from './common';
 
 describe('user', () => {
-  it('userMe', async () => {
-    const user = await client.userMe();
-    expect(user.user_id).toEqual(client.keystore.client_id);
+  it('profile', async () => {
+    const user = await client.user.profile();
+    expect(user.user_id).toEqual(keystore.user_id);
   });
 
-  it('readUser', async () => {
-    const user = await client.readUser('30265');
-    expect(user.identity_number).toEqual('30265');
+  it('fetch', async () => {
+    const user = await client.user.fetch(keystore.user_id);
+    expect(user.user_id).toEqual(keystore.user_id);
   });
 
   it('readBlockUsers', async () => {
-    const user = await client.readBlockUsers();
+    const user = await client.user.blockings();
     expect(Array.isArray(user)).toBeTruthy();
   });
 
-  it('readUsers', async () => {
-    const users = await client.readUsers(['e8e8cd79-cd40-4796-8c54-3a13cfe50115']);
+  it('fetchList', async () => {
+    const users = await client.user.fetchList(['e8e8cd79-cd40-4796-8c54-3a13cfe50115']);
     expect(users[0].identity_number).toEqual('30265');
   });
 
-  it('searchUser', async () => {
-    // const user1 = await client.searchUser("+8613801380138")
-    // expect(user1.identity_number).toEqual("7000")
-    const user2 = await client.searchUser('30265');
-    expect(user2.identity_number).toEqual('30265');
-  });
-
   it('readFriends', async () => {
-    const user = await client.readFriends();
+    const user = await client.user.friends();
     expect(Array.isArray(user)).toBeTruthy();
   });
-
-  it('createUser', async () => {
-    const user = await client.createUser('测试...');
-    expect(user.full_name).toEqual('测试...');
-  });
-
-  it('modifyProfile', async () => {
-    let user = await client.userMe();
-    let name = user.full_name;
-    user = await client.modifyProfile('测试...');
-    expect(user.full_name).toEqual('测试...');
-    user = await client.modifyProfile(name);
-    expect(user.full_name).toEqual(name);
-  });
 });