From 33ff4754a7142e0b1e35775f248363c85e45738e Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Tue, 18 May 2021 11:33:21 +0200
Subject: [PATCH] Clear timeout before resolving/rejecting

---
 packages/cosmwasm-stargate/src/cosmwasmclient.ts | 13 ++++++++++---
 packages/stargate/src/stargateclient.ts          | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.ts
index 2420e150..619b08b4 100644
--- a/packages/cosmwasm-stargate/src/cosmwasmclient.ts
+++ b/packages/cosmwasm-stargate/src/cosmwasmclient.ts
@@ -259,9 +259,16 @@ export class CosmWasmClient {
     }
     const transactionId = toHex(broadcasted.hash).toUpperCase();
     return new Promise((resolve, reject) =>
-      pollForTx(transactionId)
-        .then(resolve, reject)
-        .finally(() => clearTimeout(txPollTimeout)),
+      pollForTx(transactionId).then(
+        (value) => {
+          clearTimeout(txPollTimeout);
+          resolve(value);
+        },
+        (error) => {
+          clearTimeout(txPollTimeout);
+          reject(error);
+        },
+      ),
     );
   }
 
diff --git a/packages/stargate/src/stargateclient.ts b/packages/stargate/src/stargateclient.ts
index 6c8a9eb9..fa857fcd 100644
--- a/packages/stargate/src/stargateclient.ts
+++ b/packages/stargate/src/stargateclient.ts
@@ -351,9 +351,16 @@ export class StargateClient {
     }
     const transactionId = toHex(broadcasted.hash).toUpperCase();
     return new Promise((resolve, reject) =>
-      pollForTx(transactionId)
-        .then(resolve, reject)
-        .finally(() => clearTimeout(txPollTimeout)),
+      pollForTx(transactionId).then(
+        (value) => {
+          clearTimeout(txPollTimeout);
+          resolve(value);
+        },
+        (error) => {
+          clearTimeout(txPollTimeout);
+          reject(error);
+        },
+      ),
     );
   }