From e73fe0427461a802952f2c92943bb9ab4bbed606 Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Wed, 24 Mar 2021 13:55:28 +0100
Subject: [PATCH] stargate: Use signer types from amino

---
 packages/stargate/src/aminotypes.ts     | 7 +++----
 packages/stargate/src/testutils.spec.ts | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/stargate/src/aminotypes.ts b/packages/stargate/src/aminotypes.ts
index 7392af22..c3024941 100644
--- a/packages/stargate/src/aminotypes.ts
+++ b/packages/stargate/src/aminotypes.ts
@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { decodeBech32Pubkey, encodeBech32Pubkey } from "@cosmjs/amino";
+import { AminoMsg, decodeBech32Pubkey, encodeBech32Pubkey } from "@cosmjs/amino";
 import { fromBase64, toBase64 } from "@cosmjs/encoding";
 import {
-  Msg,
   MsgBeginRedelegate as LaunchpadMsgBeginRedelegate,
   MsgCreateValidator as LaunchpadMsgCreateValidator,
   MsgDelegate as LaunchpadMsgDelegate,
@@ -416,7 +415,7 @@ export class AminoTypes {
     this.register = { ...filteredDefaultTypes, ...additions };
   }
 
-  public toAmino({ typeUrl, value }: EncodeObject): Msg {
+  public toAmino({ typeUrl, value }: EncodeObject): AminoMsg {
     const converter = this.register[typeUrl];
     if (!converter) {
       throw new Error(
@@ -431,7 +430,7 @@ export class AminoTypes {
     };
   }
 
-  public fromAmino({ type, value }: Msg): EncodeObject {
+  public fromAmino({ type, value }: AminoMsg): EncodeObject {
     const result = Object.entries(this.register).find(([_typeUrl, { aminoType }]) => aminoType === type);
     if (!result) {
       throw new Error(
diff --git a/packages/stargate/src/testutils.spec.ts b/packages/stargate/src/testutils.spec.ts
index 8b093eb3..73d05d63 100644
--- a/packages/stargate/src/testutils.spec.ts
+++ b/packages/stargate/src/testutils.spec.ts
@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import { AminoSignResponse, StdSignDoc } from "@cosmjs/amino";
 import { Bip39, EnglishMnemonic, Random, Secp256k1, Slip10, Slip10Curve } from "@cosmjs/crypto";
 import { Bech32 } from "@cosmjs/encoding";
-import { AminoSignResponse, Secp256k1HdWallet, StdSignDoc } from "@cosmjs/launchpad";
+import { Secp256k1HdWallet } from "@cosmjs/launchpad";
 import {
   coins,
   DirectSecp256k1HdWallet,