From aa1dd9ab8d12ddf5004eb4ab5b197954428c6917 Mon Sep 17 00:00:00 2001
From: Milan Steiner <steiner.milan@hotmail.com>
Date: Wed, 9 Mar 2022 15:27:56 +0100
Subject: [PATCH] Beautify Code

---
 .../src/signingcosmwasmclient.ts              |  3 +-
 .../stargate/src/signingstargateclient.ts     | 30 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
index de7aa56e..0fab4171 100644
--- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
+++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
@@ -17,6 +17,7 @@ import {
   AminoTypes,
   calculateFee,
   Coin,
+  createBankAminoConverters,
   defaultRegistryTypes as defaultStargateTypes,
   DeliverTxResponse,
   GasPrice,
@@ -203,7 +204,7 @@ export class SigningCosmWasmClient extends CosmWasmClient {
     super(tmClient);
     const {
       registry = createDefaultRegistry(),
-      aminoTypes = new AminoTypes({ ...createWasmAminoConverters() }),
+      aminoTypes = new AminoTypes({ ...createWasmAminoConverters(), ...createBankAminoConverters() }),
     } = options;
     this.registry = registry;
     this.aminoTypes = aminoTypes;
diff --git a/packages/stargate/src/signingstargateclient.ts b/packages/stargate/src/signingstargateclient.ts
index ff1992b3..0047d7c5 100644
--- a/packages/stargate/src/signingstargateclient.ts
+++ b/packages/stargate/src/signingstargateclient.ts
@@ -91,6 +91,18 @@ export interface SigningStargateClientOptions {
   readonly gasPrice?: GasPrice;
 }
 
+export function createDefaultTypes(prefix: string): AminoConverters {
+  return {
+    ...createAuthzAminoConverters(),
+    ...createBankAminoConverters(),
+    ...createDistributionAminoConverters(),
+    ...createGovAminoConverters(),
+    ...createStakingAminoConverters(prefix),
+    ...createIbcAminoConverters(),
+    ...createFreegrantAminoConverters(),
+  };
+}
+
 export class SigningStargateClient extends StargateClient {
   public readonly registry: Registry;
   public readonly broadcastTimeoutMs: number | undefined;
@@ -133,10 +145,8 @@ export class SigningStargateClient extends StargateClient {
     super(tmClient);
     // TODO: do we really want to set a default here? Ideally we could get it from the signer such that users only have to set it once.
     const prefix = options.prefix ?? "cosmos";
-    const {
-      registry = createDefaultRegistry(),
-      aminoTypes = new AminoTypes({ ...this.createDefaultTypes(prefix) }),
-    } = options;
+    const { registry = createDefaultRegistry(), aminoTypes = new AminoTypes(createDefaultTypes(prefix)) } =
+      options;
     this.registry = registry;
     this.aminoTypes = aminoTypes;
     this.signer = signer;
@@ -319,18 +329,6 @@ export class SigningStargateClient extends StargateClient {
       : this.signAmino(signerAddress, messages, fee, memo, signerData);
   }
 
-  public createDefaultTypes(prefix: string): AminoConverters {
-    return {
-      ...createAuthzAminoConverters(),
-      ...createBankAminoConverters(),
-      ...createDistributionAminoConverters(),
-      ...createGovAminoConverters(),
-      ...createStakingAminoConverters(prefix),
-      ...createIbcAminoConverters(),
-      ...createFreegrantAminoConverters(),
-    };
-  }
-
   private async signAmino(
     signerAddress: string,
     messages: readonly EncodeObject[],