From e92534dcbf6146460241cb3b0bd557b1f620c72a Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Thu, 13 Oct 2022 03:22:02 +0200
Subject: [PATCH] Pull out sendFeeAndStakingTokens

---
 .../src/modules/staking/messages.spec.ts      | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/stargate/src/modules/staking/messages.spec.ts b/packages/stargate/src/modules/staking/messages.spec.ts
index d5acab46..6046ac00 100644
--- a/packages/stargate/src/modules/staking/messages.spec.ts
+++ b/packages/stargate/src/modules/staking/messages.spec.ts
@@ -12,30 +12,36 @@ function changePrefix(address: string, newPrefix: string): string {
   return toBech32(newPrefix, fromBech32(address).data);
 }
 
+async function sendFeeAndStakingTokens(address: string): Promise<void> {
+  const wallet = await DirectSecp256k1HdWallet.fromMnemonic(faucet.mnemonic);
+  const [firstAccount] = await wallet.getAccounts();
+  const client = await SigningStargateClient.connectWithSigner(
+    simapp.tendermintUrl,
+    wallet,
+    defaultSigningClientOptions,
+  );
+
+  const res = await client.sendTokens(
+    firstAccount.address,
+    address,
+    [coin(5000, simapp.denomFee), coin(28, simapp.denomStaking)],
+    "auto",
+  );
+  assertIsDeliverTxSuccess(res);
+  client.disconnect();
+}
+
 describe("staking messages", () => {
   describe("MsgCreateValidator", () => {
     it("works", async () => {
       pendingWithoutSimapp();
-      const wallet = await DirectSecp256k1HdWallet.fromMnemonic(faucet.mnemonic);
-      const [firstAccount] = await wallet.getAccounts();
-      const client1 = await SigningStargateClient.connectWithSigner(
-        simapp.tendermintUrl,
-        wallet,
-        defaultSigningClientOptions,
-      );
 
       const valWallet = await DirectSecp256k1HdWallet.generate();
       const [valAccount] = await valWallet.getAccounts();
 
-      const sendR = await client1.sendTokens(
-        firstAccount.address,
-        valAccount.address,
-        [coin(5000, simapp.denomFee), coin(28, simapp.denomStaking)],
-        "auto",
-      );
-      assertIsDeliverTxSuccess(sendR);
+      await sendFeeAndStakingTokens(valAccount.address);
 
-      const client2 = await SigningStargateClient.connectWithSigner(
+      const client = await SigningStargateClient.connectWithSigner(
         simapp.tendermintUrl,
         valWallet,
         defaultSigningClientOptions,
@@ -70,12 +76,11 @@ describe("staking messages", () => {
           },
         },
       };
-      const result = await client2.signAndBroadcast(valAccount.address, [createMsg], "auto");
+      const result = await client.signAndBroadcast(valAccount.address, [createMsg], "auto");
 
       assertIsDeliverTxSuccess(result);
 
-      client1.disconnect();
-      client2.disconnect();
+      client.disconnect();
     });
   });
 });