From e08ee36297f5a0db683915f47ad4eafd3b4d17d3 Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Tue, 27 Oct 2020 16:45:22 +0100
Subject: [PATCH] stargate: Remove snakifyForAmino encoding helper

---
 packages/stargate/src/encoding.spec.ts        | 45 +------------------
 packages/stargate/src/encoding.ts             | 25 -----------
 .../stargate/src/signingstargateclient.ts     |  4 +-
 packages/stargate/types/encoding.d.ts         |  2 -
 4 files changed, 3 insertions(+), 73 deletions(-)

diff --git a/packages/stargate/src/encoding.spec.ts b/packages/stargate/src/encoding.spec.ts
index e5611827..d36b1f18 100644
--- a/packages/stargate/src/encoding.spec.ts
+++ b/packages/stargate/src/encoding.spec.ts
@@ -1,50 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { coin, coins, makeSignDoc as makeSignDocAmino } from "@cosmjs/launchpad";
-
-import { cosmos } from "./codec";
-import { getMsgType, snakifyForAmino } from "./encoding";
-import { faucet, validator } from "./testutils.spec";
+import { getMsgType } from "./encoding";
 
 describe("encoding", () => {
-  describe("snakifyForAmino", () => {
-    it("works", () => {
-      const msg = cosmos.staking.v1beta1.MsgDelegate.create({
-        delegatorAddress: faucet.address0,
-        validatorAddress: validator.validatorAddress,
-        amount: coin(1234, "ustake"),
-      });
-      const msgAny = {
-        type: "cosmos-sdk/MsgDelegate",
-        value: msg,
-      };
-      const fee = {
-        amount: coins(2000, "ucosm"),
-        gas: "200000",
-      };
-      const chainId = "testing";
-      const memo = "testing testing";
-      const accountNumber = 1;
-      const sequence = 16;
-      const signDoc = makeSignDocAmino([msgAny], fee, chainId, memo, accountNumber, sequence);
-      expect(snakifyForAmino(signDoc)).toEqual({
-        ...signDoc,
-        msgs: [
-          {
-            type: "cosmos-sdk/MsgDelegate",
-            value: {
-              delegator_address: faucet.address0,
-              validator_address: validator.validatorAddress,
-              amount: {
-                amount: "1234",
-                denom: "ustake",
-              },
-            },
-          },
-        ],
-      });
-    });
-  });
-
   describe("getMsgType", () => {
     it("works for known type url", () => {
       const msgType = getMsgType("/cosmos.staking.v1beta1.MsgDelegate");
diff --git a/packages/stargate/src/encoding.ts b/packages/stargate/src/encoding.ts
index f46c9cbf..8b238a79 100644
--- a/packages/stargate/src/encoding.ts
+++ b/packages/stargate/src/encoding.ts
@@ -1,28 +1,3 @@
-import { Msg, StdSignDoc } from "@cosmjs/launchpad";
-
-function snakifyMsgValue(obj: Msg): Msg {
-  return {
-    ...obj,
-    value: Object.entries(obj.value).reduce(
-      (snakified, [key, value]) => ({
-        ...snakified,
-        [key
-          .split(/(?=[A-Z])/)
-          .join("_")
-          .toLowerCase()]: value,
-      }),
-      {},
-    ),
-  };
-}
-
-export function snakifyForAmino(signDoc: StdSignDoc): StdSignDoc {
-  return {
-    ...signDoc,
-    msgs: signDoc.msgs.map(snakifyMsgValue),
-  };
-}
-
 export function getMsgType(typeUrl: string): string {
   const typeRegister: Record<string, string> = {
     "/cosmos.bank.v1beta1.MsgSend": "cosmos-sdk/MsgSend",
diff --git a/packages/stargate/src/signingstargateclient.ts b/packages/stargate/src/signingstargateclient.ts
index 288b8e28..e2dc7d41 100644
--- a/packages/stargate/src/signingstargateclient.ts
+++ b/packages/stargate/src/signingstargateclient.ts
@@ -24,7 +24,7 @@ import {
 import { Client as TendermintClient } from "@cosmjs/tendermint-rpc";
 
 import { cosmos } from "./codec";
-import { getMsgType, snakifyForAmino } from "./encoding";
+import { getMsgType } from "./encoding";
 import { BroadcastTxResponse, StargateClient } from "./stargateclient";
 
 const { TxRaw } = cosmos.tx.v1beta1;
@@ -141,7 +141,7 @@ export class SigningStargateClient extends StargateClient {
       value: msg.value,
     }));
     const signDoc = makeSignDocAmino(msgs, fee, chainId, memo, accountNumber, sequence);
-    const signResponse = await this.signer.signAmino(address, snakifyForAmino(signDoc));
+    const signResponse = await this.signer.signAmino(address, signDoc);
     const txRaw = TxRaw.create({
       bodyBytes: txBodyBytes,
       authInfoBytes: authInfoBytes,
diff --git a/packages/stargate/types/encoding.d.ts b/packages/stargate/types/encoding.d.ts
index 605706cb..6404c1ca 100644
--- a/packages/stargate/types/encoding.d.ts
+++ b/packages/stargate/types/encoding.d.ts
@@ -1,3 +1 @@
-import { StdSignDoc } from "@cosmjs/launchpad";
-export declare function snakifyForAmino(signDoc: StdSignDoc): StdSignDoc;
 export declare function getMsgType(typeUrl: string): string;