From 989b07fb3da8b3fffcb859d10065a83ff2639acc Mon Sep 17 00:00:00 2001
From: rrr523 <gaoyibobo@foxmail.com>
Date: Fri, 8 Sep 2023 15:44:36 +0800
Subject: [PATCH] test: Test case update

---
 .../nextjs/src/components/query/index.tsx     | 19 ++++++
 packages/chain-sdk/src/api/account.ts         | 12 ----
 .../.env.simple.ts => tests/.env.example.ts}  |  0
 .../chain-sdk/{src => }/tests/account.spec.ts | 10 ---
 .../chain-sdk/{src => }/tests/config.spec.ts  |  4 +-
 .../{src => }/tests/parsexml.spec.ts          |  4 +-
 .../chain-sdk/{src => }/tests/policy.spec.ts  |  1 -
 .../chain-sdk/{src => }/tests/query.spec.ts   |  0
 .../chain-sdk/{src => }/tests/storage.spec.ts | 65 +++++++++++--------
 .../chain-sdk/{src => }/tests/utils.spec.ts   |  2 +-
 .../chain-sdk/{src => }/tests/wallet.spec.ts  |  2 +-
 11 files changed, 63 insertions(+), 56 deletions(-)
 rename packages/chain-sdk/{src/tests/.env.simple.ts => tests/.env.example.ts} (100%)
 rename packages/chain-sdk/{src => }/tests/account.spec.ts (78%)
 rename packages/chain-sdk/{src => }/tests/config.spec.ts (94%)
 rename packages/chain-sdk/{src => }/tests/parsexml.spec.ts (98%)
 rename packages/chain-sdk/{src => }/tests/policy.spec.ts (98%)
 rename packages/chain-sdk/{src => }/tests/query.spec.ts (100%)
 rename packages/chain-sdk/{src => }/tests/storage.spec.ts (73%)
 rename packages/chain-sdk/{src => }/tests/utils.spec.ts (96%)
 rename packages/chain-sdk/{src => }/tests/wallet.spec.ts (98%)

diff --git a/examples/nextjs/src/components/query/index.tsx b/examples/nextjs/src/components/query/index.tsx
index 45a8b3c1..4e63b53d 100644
--- a/examples/nextjs/src/components/query/index.tsx
+++ b/examples/nextjs/src/components/query/index.tsx
@@ -122,6 +122,25 @@ export const QueryComponent = () => {
               const { paymentAccounts } = await client.payment.getPaymentAccountsByOwner({
                 owner: address,
               });
+              console.log('paymentAccounts', paymentAccounts);
+              const res = await client.payment.paymentAccount({
+                addr: paymentAccounts[0],
+              });
+              console.log('res', res);
+            }}
+          >
+            get paymentAccount
+          </button>
+        </li>
+        <li>
+          <button
+            onClick={async () => {
+              if (!address) return;
+
+              const { paymentAccounts } = await client.payment.getPaymentAccountsByOwner({
+                owner: address,
+              });
+              console.log('paymentAccounts', paymentAccounts);
 
               const res = await client.bucket.listBucketsByPaymentAccount({
                 paymentAccount: paymentAccounts[0],
diff --git a/packages/chain-sdk/src/api/account.ts b/packages/chain-sdk/src/api/account.ts
index 335cf5d7..80a4b47e 100644
--- a/packages/chain-sdk/src/api/account.ts
+++ b/packages/chain-sdk/src/api/account.ts
@@ -38,11 +38,6 @@ export interface IAccount {
    */
   getAccountBalance(request: QueryBalanceRequest): Promise<QueryBalanceResponse>;
 
-  /**
-   * takes an address string as parameters and returns a pointer to a paymentTypes.
-   */
-  getPaymentAccount(request: QueryPaymentAccountRequest): Promise<QueryPaymentAccountResponse>;
-
   getModuleAccounts(): Promise<QueryModuleAccountsResponse>;
 
   getModuleAccountByName(name: string): Promise<QueryModuleAccountByNameResponse>;
@@ -110,13 +105,6 @@ export class Account implements IAccount {
     return await rpc.ModuleAccounts();
   }
 
-  public async getPaymentAccount(
-    request: QueryPaymentAccountRequest,
-  ): Promise<QueryPaymentAccountResponse> {
-    const rpc = await this.queryClient.getPaymentQueryClient();
-    return await rpc.PaymentAccount(request);
-  }
-
   public async getAccountBalance(request: QueryBalanceRequest): Promise<QueryBalanceResponse> {
     const rpc = await this.queryClient.getBankQueryClient();
     return await rpc.Balance(request);
diff --git a/packages/chain-sdk/src/tests/.env.simple.ts b/packages/chain-sdk/tests/.env.example.ts
similarity index 100%
rename from packages/chain-sdk/src/tests/.env.simple.ts
rename to packages/chain-sdk/tests/.env.example.ts
diff --git a/packages/chain-sdk/src/tests/account.spec.ts b/packages/chain-sdk/tests/account.spec.ts
similarity index 78%
rename from packages/chain-sdk/src/tests/account.spec.ts
rename to packages/chain-sdk/tests/account.spec.ts
index 6f3112c5..5f0d670a 100644
--- a/packages/chain-sdk/src/tests/account.spec.ts
+++ b/packages/chain-sdk/tests/account.spec.ts
@@ -25,16 +25,6 @@ describe('accountQuery', () => {
     });
   });
 
-  describe('getPaymentAccount', () => {
-    test('it works', async () => {
-      const res = await client.account.getPaymentAccount({
-        addr: ACCOUNT.address,
-      });
-
-      expect(res).not.toBeNull();
-    });
-  });
-
   describe('getModuleAccounts', () => {
     test('it works', async () => {
       const res = await client.account.getModuleAccounts();
diff --git a/packages/chain-sdk/src/tests/config.spec.ts b/packages/chain-sdk/tests/config.spec.ts
similarity index 94%
rename from packages/chain-sdk/src/tests/config.spec.ts
rename to packages/chain-sdk/tests/config.spec.ts
index fca62505..4646ce51 100644
--- a/packages/chain-sdk/src/tests/config.spec.ts
+++ b/packages/chain-sdk/tests/config.spec.ts
@@ -1,5 +1,5 @@
-import { Client } from '..';
-import { ISimulateGasFee } from '../types';
+import { Client } from '../src';
+import { ISimulateGasFee } from '../src/types';
 import { ACCOUNT_ADDRESS, ACCOUNT_PRIVATEKEY, GREENFIELD_CHAIN_ID, GRPC_URL } from './.env';
 
 export const client = Client.create(GRPC_URL, GREENFIELD_CHAIN_ID);
diff --git a/packages/chain-sdk/src/tests/parsexml.spec.ts b/packages/chain-sdk/tests/parsexml.spec.ts
similarity index 98%
rename from packages/chain-sdk/src/tests/parsexml.spec.ts
rename to packages/chain-sdk/tests/parsexml.spec.ts
index f0e3fb07..1d8d1775 100644
--- a/packages/chain-sdk/src/tests/parsexml.spec.ts
+++ b/packages/chain-sdk/tests/parsexml.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
-import { parseListObjectsByBucketNameResponse } from '../clients/spclient/spApis/listObjectsByBucket';
-import { parseGetUserBucketsResponse } from '../clients/spclient/spApis/getUserBuckets';
+import { parseListObjectsByBucketNameResponse } from '../src/clients/spclient/spApis/listObjectsByBucket';
+import { parseGetUserBucketsResponse } from '../src/clients/spclient/spApis/getUserBuckets';
 
 describe('parseListObjectsByBucketNameResponse', () => {
   test('parse CommonPrefixes contains 2 element at least', async () => {
diff --git a/packages/chain-sdk/src/tests/policy.spec.ts b/packages/chain-sdk/tests/policy.spec.ts
similarity index 98%
rename from packages/chain-sdk/src/tests/policy.spec.ts
rename to packages/chain-sdk/tests/policy.spec.ts
index e21f1097..63b71444 100644
--- a/packages/chain-sdk/src/tests/policy.spec.ts
+++ b/packages/chain-sdk/tests/policy.spec.ts
@@ -16,7 +16,6 @@ describe('groupTx', () => {
         creator: ACCOUNT.address,
         extra: EXTRA,
         groupName: GROUP_NAME,
-        members: [ACCOUNT.address],
       });
 
       const simulateInfo = await createGroupTx.simulate({
diff --git a/packages/chain-sdk/src/tests/query.spec.ts b/packages/chain-sdk/tests/query.spec.ts
similarity index 100%
rename from packages/chain-sdk/src/tests/query.spec.ts
rename to packages/chain-sdk/tests/query.spec.ts
diff --git a/packages/chain-sdk/src/tests/storage.spec.ts b/packages/chain-sdk/tests/storage.spec.ts
similarity index 73%
rename from packages/chain-sdk/src/tests/storage.spec.ts
rename to packages/chain-sdk/tests/storage.spec.ts
index a2988df0..8842e275 100644
--- a/packages/chain-sdk/src/tests/storage.spec.ts
+++ b/packages/chain-sdk/tests/storage.spec.ts
@@ -15,14 +15,22 @@ describe('storageTx', () => {
 
     test('create bucket', async () => {
       const spInfo = await selectSp();
-      const createBucketTx = await client.bucket.createBucket({
-        bucketName: BUCKET_NAME,
-        creator: ACCOUNT.address,
-        visibility: 'VISIBILITY_TYPE_PUBLIC_READ',
-        chargedReadQuota: '0',
-        spInfo,
-        signType: 'authTypeV2',
-      });
+      const createBucketTx = await client.bucket.createBucket(
+        {
+          bucketName: BUCKET_NAME,
+          creator: ACCOUNT.address,
+          visibility: 'VISIBILITY_TYPE_PUBLIC_READ',
+          chargedReadQuota: '0',
+          spInfo: {
+            primarySpAddress: spInfo.primarySpAddress,
+          },
+          paymentAddress: ACCOUNT.address,
+        },
+        {
+          type: 'ECDSA',
+          privateKey: ACCOUNT.privateKey,
+        },
+      );
 
       const simulateInfo = await createBucketTx.simulate({
         denom: 'BNB',
@@ -56,25 +64,28 @@ describe('storageTx', () => {
     console.log('object name', OBJECT_NAME);
 
     test('create Object', async () => {
-      const spInfo = await selectSp();
-      const createObjectTx = await client.object.createObject({
-        bucketName: BUCKET_NAME,
-        objectName: OBJECT_NAME,
-        spInfo,
-        contentLength: 0,
-        fileType: 'text/plain',
-        expectCheckSums: [
-          '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
-          '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
-          '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
-          '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
-          '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
-          '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
-          '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
-        ],
-        creator: ACCOUNT.address,
-        signType: 'authTypeV2',
-      });
+      const createObjectTx = await client.object.createObject(
+        {
+          bucketName: BUCKET_NAME,
+          objectName: OBJECT_NAME,
+          contentLength: 0,
+          fileType: 'text/plain',
+          expectCheckSums: [
+            '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
+            '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
+            '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
+            '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
+            '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
+            '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
+            '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=',
+          ],
+          creator: ACCOUNT.address,
+        },
+        {
+          type: 'ECDSA',
+          privateKey: ACCOUNT.privateKey,
+        },
+      );
 
       const simulateInfo = await createObjectTx.simulate({
         denom: 'BNB',
diff --git a/packages/chain-sdk/src/tests/utils.spec.ts b/packages/chain-sdk/tests/utils.spec.ts
similarity index 96%
rename from packages/chain-sdk/src/tests/utils.spec.ts
rename to packages/chain-sdk/tests/utils.spec.ts
index 336db589..501ce822 100644
--- a/packages/chain-sdk/src/tests/utils.spec.ts
+++ b/packages/chain-sdk/tests/utils.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { encodePath } from '../clients/spclient/auth';
+import { encodePath } from '../src/clients/spclient/auth';
 
 describe('encodePaths', () => {
   it('encode english chars', () => {
diff --git a/packages/chain-sdk/src/tests/wallet.spec.ts b/packages/chain-sdk/tests/wallet.spec.ts
similarity index 98%
rename from packages/chain-sdk/src/tests/wallet.spec.ts
rename to packages/chain-sdk/tests/wallet.spec.ts
index e4f2aac3..42e3c488 100644
--- a/packages/chain-sdk/src/tests/wallet.spec.ts
+++ b/packages/chain-sdk/tests/wallet.spec.ts
@@ -119,7 +119,7 @@ async function makeTransferTx() {
   return await client.account.transfer({
     amount: [
       {
-        amount: '10',
+        amount: '1000000000000000',
         denom: 'BNB',
       },
     ],