should use pubkey instead of pubkey.value

cosmology-tech · Aug 18, 2023 · ec04dc5 · ec04dc5
1 parent 0525906
commit ec04dc5
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 19 deletions.
diff --git a/__fixtures__/output1/cosmos/staking/v1beta1/tx.amino.ts b/__fixtures__/output1/cosmos/staking/v1beta1/tx.amino.ts
@@ -140,7 +140,7 @@ export const AminoConverter = {
         minSelfDelegation: min_self_delegation,
         delegatorAddress: delegator_address,
         validatorAddress: validator_address,
-        pubkey: encodePubkey(pubkey.value),
+        pubkey: encodePubkey(pubkey),
         value: {
           denom: value.denom,
           amount: value.amount

diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.amino.ts
@@ -139,7 +139,7 @@ export const AminoConverter = {
         minSelfDelegation: min_self_delegation,
         delegatorAddress: delegator_address,
         validatorAddress: validator_address,
-        pubkey: encodePubkey(pubkey.value),
+        pubkey: encodePubkey(pubkey),
         value: {
           denom: value.denom,
           amount: value.amount

diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts
@@ -3283,7 +3283,7 @@ export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: _m0.Reader | Uint8Ar
   }
 };
 export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => {
-  return encodePubkey(content.value);
+  return encodePubkey(content);
 };
 export const Cosmos_cryptoPubKey_ToAmino = (content: Any) => {
   return decodePubkey(content);

diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts
@@ -1337,7 +1337,7 @@ export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: _m0.Reader | Uint8Ar
   }
 };
 export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => {
-  return encodePubkey(content.value);
+  return encodePubkey(content);
 };
 export const Cosmos_cryptoPubKey_ToAmino = (content: Any) => {
   return decodePubkey(content);

diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/staking.ts
@@ -3283,7 +3283,7 @@ export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: _m0.Reader | Uint8Ar
   }
 };
 export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => {
-  return encodePubkey(content.value);
+  return encodePubkey(content);
 };
 export const Cosmos_cryptoPubKey_ToAmino = (content: Any) => {
   return decodePubkey(content);

diff --git a/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputv3/cosmos/staking/v1beta1/tx.ts
@@ -1337,7 +1337,7 @@ export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: _m0.Reader | Uint8Ar
   }
 };
 export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => {
-  return encodePubkey(content.value);
+  return encodePubkey(content);
 };
 export const Cosmos_cryptoPubKey_ToAmino = (content: Any) => {
   return decodePubkey(content);

diff --git a/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/tx.amino.ts b/__fixtures__/v-next/outputv4/cosmos/staking/v1beta1/tx.amino.ts
@@ -139,7 +139,7 @@ export const AminoConverter = {
         minSelfDelegation: min_self_delegation,
         delegatorAddress: delegator_address,
         validatorAddress: validator_address,
-        pubkey: encodePubkey(pubkey.value),
+        pubkey: encodePubkey(pubkey),
         value: {
           denom: value.denom,
           amount: value.amount

diff --git a/packages/ast/src/encoding/amino/converter/__snapshots__/amino-converter.spec.ts.snap b/packages/ast/src/encoding/amino/converter/__snapshots__/amino-converter.spec.ts.snap
@@ -61,7 +61,7 @@ exports[`cosmos/staking/v1beta1/tx AminoConverter 1`] = `
         minSelfDelegation: min_self_delegation,
         delegatorAddress: delegator_address,
         validatorAddress: validator_address,
-        pubkey: encodePubkey(pubkey.value),
+        pubkey: encodePubkey(pubkey),
         value: {
           denom: value.denom,
           amount: value.amount

diff --git a/packages/ast/src/encoding/amino/from-amino-json/utils.ts b/packages/ast/src/encoding/amino/from-amino-json/utils.ts
@@ -346,10 +346,7 @@ export const fromAmino = {
             t.callExpression(
                 t.identifier('encodePubkey'),
                 [
-                  t.memberExpression(
-                    t.identifier('pubkey'),
-                    t.identifier('value')
-                  )
+                  t.identifier('pubkey')
                 ]
             )
         )

diff --git a/...t/src/encoding/proto/implements/__tests__/__snapshots__/interface-from-amino.test.ts.snap b/...t/src/encoding/proto/implements/__tests__/__snapshots__/interface-from-amino.test.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`MsgCreateValidator MsgCreateValidator 1`] = `
 "export const Cosmos_cryptoPubKey_FromAmino = (content: AnyAmino) => {
-  return encodePubkey(content.value);
+  return encodePubkey(content);
 };"
 `;
 

diff --git a/packages/ast/src/encoding/proto/implements/from-amino.ts b/packages/ast/src/encoding/proto/implements/from-amino.ts
@@ -53,12 +53,7 @@ export const createInterfaceFromAmino = (
         return makeFunctionWrapper(functionName, t.returnStatement(
           t.callExpression(
             t.identifier('encodePubkey'),
-            [
-                t.memberExpression(
-                    t.identifier('content'),
-                    t.identifier('value')
-                )
-            ]
+            [t.identifier('content')]
           )
         ));
     }