From c6bbd5b60d9ec2038675f8889f765be4ee01c211 Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Tue, 30 Mar 2021 10:44:26 +0200
Subject: [PATCH] stargate: Remove coinFromProto

---
 packages/stargate/src/aminotypes.ts     | 17 ++++++++---------
 packages/stargate/src/index.ts          |  1 -
 packages/stargate/src/stargateclient.ts | 15 ++-------------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/packages/stargate/src/aminotypes.ts b/packages/stargate/src/aminotypes.ts
index da7db5ff..811c4e3e 100644
--- a/packages/stargate/src/aminotypes.ts
+++ b/packages/stargate/src/aminotypes.ts
@@ -31,7 +31,6 @@ import {
   MsgEditValidator,
   MsgUndelegate,
 } from "./codec/cosmos/staking/v1beta1/tx";
-import { coinFromProto } from "./stargateclient";
 
 export interface AminoConverter {
   readonly aminoType: string;
@@ -50,7 +49,7 @@ function createDefaultTypes(prefix: string): Record<string, AminoConverter> {
         return {
           from_address: fromAddress,
           to_address: toAddress,
-          amount: amount.map(coinFromProto),
+          amount: amount,
         };
       },
       fromAmino: ({ from_address, to_address, amount }: AminoMsgSend["value"]): MsgSend => ({
@@ -70,7 +69,7 @@ function createDefaultTypes(prefix: string): Record<string, AminoConverter> {
             assertDefinedAndNotNull(input.coins, "missing input.amount");
             return {
               address: input.address,
-              coins: input.coins.map(coinFromProto),
+              coins: input.coins,
             };
           }),
           outputs: outputs.map((output) => {
@@ -78,7 +77,7 @@ function createDefaultTypes(prefix: string): Record<string, AminoConverter> {
             assertDefinedAndNotNull(output.coins, "missing output.coins");
             return {
               address: output.address,
-              coins: output.coins.map(coinFromProto),
+              coins: output.coins,
             };
           }),
         };
@@ -100,7 +99,7 @@ function createDefaultTypes(prefix: string): Record<string, AminoConverter> {
         assertDefinedAndNotNull(amount);
         assertDefinedAndNotNull(depositor);
         return {
-          amount: amount.map(coinFromProto),
+          amount: amount,
           depositor: depositor,
         };
       },
@@ -183,7 +182,7 @@ function createDefaultTypes(prefix: string): Record<string, AminoConverter> {
           delegator_address: delegatorAddress,
           validator_src_address: validatorSrcAddress,
           validator_dst_address: validatorDstAddress,
-          amount: coinFromProto(amount),
+          amount: amount,
         };
       },
       fromAmino: ({
@@ -248,7 +247,7 @@ function createDefaultTypes(prefix: string): Record<string, AminoConverter> {
             },
             prefix,
           ),
-          value: coinFromProto(value),
+          value: value,
         };
       },
       fromAmino: ({
@@ -297,7 +296,7 @@ function createDefaultTypes(prefix: string): Record<string, AminoConverter> {
         return {
           delegator_address: delegatorAddress,
           validator_address: validatorAddress,
-          amount: coinFromProto(amount),
+          amount: amount,
         };
       },
       fromAmino: ({
@@ -371,7 +370,7 @@ function createDefaultTypes(prefix: string): Record<string, AminoConverter> {
         return {
           delegator_address: delegatorAddress,
           validator_address: validatorAddress,
-          amount: coinFromProto(amount),
+          amount: amount,
         };
       },
       fromAmino: ({
diff --git a/packages/stargate/src/index.ts b/packages/stargate/src/index.ts
index 729bdac7..76357e07 100644
--- a/packages/stargate/src/index.ts
+++ b/packages/stargate/src/index.ts
@@ -75,7 +75,6 @@ export {
   BroadcastTxFailure,
   BroadcastTxResponse,
   BroadcastTxSuccess,
-  coinFromProto,
   IndexedTx,
   isBroadcastTxFailure,
   isBroadcastTxSuccess,
diff --git a/packages/stargate/src/stargateclient.ts b/packages/stargate/src/stargateclient.ts
index 2869a0b4..591ee5e3 100644
--- a/packages/stargate/src/stargateclient.ts
+++ b/packages/stargate/src/stargateclient.ts
@@ -99,15 +99,6 @@ export function assertIsBroadcastTxSuccess(
   }
 }
 
-export function coinFromProto(input: Coin): Coin {
-  assertDefinedAndNotNull(input.amount);
-  assertDefinedAndNotNull(input.denom);
-  return {
-    amount: input.amount,
-    denom: input.denom,
-  };
-}
-
 /** Use for testing only */
 export interface PrivateStargateClient {
   readonly tmClient: Tendermint34Client | undefined;
@@ -213,8 +204,7 @@ export class StargateClient {
   }
 
   public async getBalance(address: string, searchDenom: string): Promise<Coin | null> {
-    const balance = await this.forceGetQueryClient().bank.balance(address, searchDenom);
-    return balance ? coinFromProto(balance) : null;
+    return this.forceGetQueryClient().bank.balance(address, searchDenom);
   }
 
   /**
@@ -224,8 +214,7 @@ export class StargateClient {
    * proofs from such a method.
    */
   public async getAllBalancesUnverified(address: string): Promise<readonly Coin[]> {
-    const balances = await this.forceGetQueryClient().bank.unverified.allBalances(address);
-    return balances.map(coinFromProto);
+    return this.forceGetQueryClient().bank.unverified.allBalances(address);
   }
 
   public async getTx(id: string): Promise<IndexedTx | null> {