finalaze tokenfactory tests

neutron-org · Sep 8, 2023 · 3648f51 · 3648f51
1 parent a2fab01
commit 3648f51
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 43 deletions.
diff --git a/src/helpers/proposal.ts b/src/helpers/proposal.ts
@@ -16,7 +16,6 @@ export type PinCodesInfo = {
   codes_ids: number[];
 };
 
-
 export type UpdateParamsInterchaintxsInfo = {
   title: string;
   description: string;
@@ -206,7 +205,7 @@ export const updateInterchaintxsParamsProposal = (
       admin_proposal: {
         proposal_execute_message: {
           message: JSON.stringify({
-            '@type': '/cosmos.interchaintxs.MsgUpdateParams',
+            '@type': '/neutron.interchaintxs.MsgUpdateParams',
             authority: ADMIN_MODULE_ADDRESS,
             pararms: {
               msg_submit_tx_max_messages: info.msg_submit_tx_max_messages,

diff --git a/src/helpers/tokenfactory.ts b/src/helpers/tokenfactory.ts
@@ -22,10 +22,10 @@ cosmosclient.codec.register(
   '/osmosis.tokenfactory.v1beta1.MsgChangeAdmin',
   osmosis.tokenfactory.v1beta1.MsgChangeAdmin,
 );
-// cosmosclient.codec.register(
-//   '/osmosis.tokenfactory.v1beta1.MsgChangeAdmin',
-//   osmosis.tokenfactory.v1beta1.MsgChangeAdmin,
-// );
+cosmosclient.codec.register(
+  '/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook',
+  osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook,
+);
 
 export const msgMintDenom = async (
   cmNeutron: WalletWrapper,

diff --git a/src/testcases/parallel/governance.test.ts b/src/testcases/parallel/governance.test.ts
@@ -1047,11 +1047,9 @@ describe('Neutron / Governance', () => {
   describe('vote for proposal #20 with unbonded funds(no, yes, yes)', () => {
     const proposalId = 20;
     test('vote NO from wallet 1', async () => {
-
       await daoMember1.voteNo(proposalId);
     });
     test('vote YES from wallet 2', async () => {
-
       await daoMember2.voteYes(proposalId);
     });
     test('vote YES from wallet 3', async () => {

diff --git a/src/testcases/parallel/tokenfactory.test.ts b/src/testcases/parallel/tokenfactory.test.ts
@@ -13,7 +13,8 @@ import {
   msgBurn,
   msgChangeAdmin,
   msgCreateDenom,
-  msgMintDenom, msgSetBeforeSendHook,
+  msgMintDenom,
+  msgSetBeforeSendHook,
 } from '../../helpers/tokenfactory';
 
 interface DenomsFromCreator {
@@ -25,7 +26,7 @@ interface AuthorityMetadata {
 }
 
 interface BerforeSendHook {
-  readonly before_send_hook: { readonly CosmwasmAddress: string };
+  readonly cosmwasm_address: string;
 }
 
 describe('Neutron / Tokenfactory', () => {
@@ -121,14 +122,10 @@ describe('Neutron / Tokenfactory', () => {
         'new_token_denom',
       );
 
-      console.log(newTokenDenom);
-      console.log(neutronChain.sdk.url);
-
       const authorityMetadataBefore = await getAuthorityMetadata(
         neutronChain.sdk.url,
         newTokenDenom,
       );
-      console.log(authorityMetadataBefore);
 
       expect(authorityMetadataBefore.authority_metadata).toEqual({
         Admin: ownerWallet.address.toString(),
@@ -220,9 +217,7 @@ describe('Neutron / Tokenfactory', () => {
       newTokenDenom,
     );
 
-    expect(hookAfter.before_send_hook.CosmwasmAddress).toEqual(
-      ownerWallet.address.toString,
-    );
+    expect(hookAfter.cosmwasm_address).toEqual(ownerWallet.address.toString());
   });
 
   describe('wasmbindings', () => {
@@ -325,6 +320,25 @@ describe('Neutron / Tokenfactory', () => {
       );
       expect(res.admin).toEqual(contractAddress);
     });
+    test('set_before_send_hook', async () => {
+      await neutronAccount.executeContract(
+        contractAddress,
+        JSON.stringify({
+          set_before_send_hook: {
+            denom,
+            cosm_wasm_addr: contractAddress,
+          },
+        }),
+      );
+      const res = await neutronChain.queryContract<{
+        cosm_wasm_addr: string;
+      }>(contractAddress, {
+        before_send_hook: {
+          denom,
+        },
+      });
+      expect(res.cosm_wasm_addr).toEqual(contractAddress);
+    });
 
     test('change admin', async () => {
       await neutronAccount.executeContract(
@@ -362,32 +376,6 @@ describe('Neutron / Tokenfactory', () => {
       );
       expect(res.admin).toEqual(neutronAccount.wallet.address.toString());
     });
-    test('set_before_send_hook', async () => {
-      await neutronAccount.executeContract(
-        contractAddress,
-        JSON.stringify({
-          set_before_send_hook: {
-            denom,
-            cosm_wasm_addr: contractAddress
-          },
-        }),
-      );
-
-      const balance = await neutronChain.queryDenomBalance(
-        neutronAccount.wallet.address.toString(),
-        denom,
-      );
-      expect(balance).toEqual(amount);
-      const res = await neutronChain.queryContract<{ cosm_wasm_addr: string }>(
-        contractAddress,
-        {
-          before_send_hook: {
-            denom,
-          },
-        },
-      );
-      expect(res.cosm_wasm_addr).toEqual(contractAddress);
-    });
   });
 });