Merge branch 'simplify-promises'

webmaster128 · webmaster128 · commit b00ff7f9cde2 · 2025-11-23T14:31:04.000+01:00
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/packages/cosmwasm/src/cosmwasmclient.ts b/packages/cosmwasm/src/cosmwasmclient.ts
@@ -286,18 +286,9 @@ export class CosmWasmClient {
 
     const transactionId = await this.broadcastTxSync(tx);
 
-    return new Promise((resolve, reject) =>
-      pollForTx(transactionId).then(
-        (value) => {
-          clearTimeout(txPollTimeout);
-          resolve(value);
-        },
-        (error) => {
-          clearTimeout(txPollTimeout);
-          reject(error);
-        },
-      ),
-    );
+    return pollForTx(transactionId).finally(() => {
+      clearTimeout(txPollTimeout);
+    });
   }
 
   /**
diff --git a/packages/socket/package.json b/packages/socket/package.json
@@ -47,6 +47,7 @@
     "xstream": "^11.14.0"
   },
   "devDependencies": {
+    "@cosmjs/utils": "workspace:^",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@types/jasmine": "^4",
     "@types/karma-firefox-launcher": "^2",
diff --git a/packages/socket/src/queueingstreamingsocket.spec.ts b/packages/socket/src/queueingstreamingsocket.spec.ts
@@ -1,3 +1,5 @@
+import { sleep } from "@cosmjs/utils";
+
 import { ConnectionStatus, QueueingStreamingSocket } from "./queueingstreamingsocket";
 
 const enabled = !!globalThis.process?.env.SOCKETSERVER_ENABLED;
@@ -62,10 +64,11 @@ describe("QueueingStreamingSocket", () => {
       requests.forEach((request) => {
         socket.queueRequest(request);
       });
-      setTimeout(() => {
-        expect(socket.getQueueLength()).toEqual(3);
-        socket.connect();
-      }, 5_000);
+
+      await sleep(5_000);
+
+      expect(socket.getQueueLength()).toEqual(3);
+      socket.connect();
 
       return ret;
     });
@@ -183,13 +186,15 @@ describe("QueueingStreamingSocket", () => {
       });
 
       socket.connect();
-      setTimeout(() => {
-        socket.disconnect();
-        socket.reconnect();
-        setTimeout(() => {
-          socket.disconnect();
-        }, 1000);
-      }, 1000);
+
+      await sleep(1000);
+
+      socket.disconnect();
+      socket.reconnect();
+
+      await sleep(1000);
+
+      socket.disconnect();
 
       return ret;
     });
diff --git a/packages/socket/src/reconnectingsocket.spec.ts b/packages/socket/src/reconnectingsocket.spec.ts
@@ -1,3 +1,5 @@
+import { sleep } from "@cosmjs/utils";
+
 import { ReconnectingSocket } from "./reconnectingsocket";
 
 /** @see https://nodejs.org/api/child_process.html#child_process_child_process_exec_command_options_callback */
@@ -17,34 +19,25 @@ describe("ReconnectingSocket", () => {
 
   (enabled ? describe : xdescribe)("connect", () => {
     it("cannot connect after being connected", async () => {
-      let done!: (() => void) & { fail: (e?: any) => void };
-      const ret = new Promise<void>((resolve, reject) => {
-        done = resolve as typeof done;
-        done.fail = reject;
-      });
       const socket = new ReconnectingSocket(socketServerUrl);
       // Necessary otherwise the producer doesn’t start
       socket.events.subscribe({});
 
       socket.connect();
 
-      setTimeout(() => {
-        expect(() => {
-          socket.connect();
-        }).toThrowError(/cannot connect/i);
-        done();
-      }, 1000);
+      await sleep(1000);
 
-      return ret;
+      expect(() => {
+        socket.connect();
+      }).toThrowError(/cannot connect/i);
     });
   });
 
   (enabled ? describe : xdescribe)("disconnect", () => {
     it("ends the events stream", async () => {
-      let done!: (() => void) & { fail: (e?: any) => void };
-      const ret = new Promise<void>((resolve, reject) => {
-        done = resolve as typeof done;
-        done.fail = reject;
+      let done!: () => void;
+      const ret = new Promise<void>((resolve) => {
+        done = resolve;
       });
       const socket = new ReconnectingSocket(socketServerUrl);
       socket.events.subscribe({
@@ -53,34 +46,25 @@ describe("ReconnectingSocket", () => {
 
       socket.connect();
 
-      setTimeout(() => {
-        socket.disconnect();
-      }, 1000);
+      await sleep(1000);
 
+      socket.disconnect();
       return ret;
     });
 
     it("cannot connect after being disconnected", async () => {
-      let done!: (() => void) & { fail: (e?: any) => void };
-      const ret = new Promise<void>((resolve, reject) => {
-        done = resolve as typeof done;
-        done.fail = reject;
-      });
       const socket = new ReconnectingSocket(socketServerUrl);
       // Necessary otherwise the producer doesn’t start
       socket.events.subscribe({});
 
       socket.connect();
 
-      setTimeout(() => {
-        socket.disconnect();
-        expect(() => {
-          socket.connect();
-        }).toThrowError(/cannot connect/i);
-        done();
-      }, 1000);
+      await sleep(1000);
 
-      return ret;
+      socket.disconnect();
+      expect(() => {
+        socket.connect();
+      }).toThrowError(/cannot connect/i);
     });
 
     it("can disconnect without waiting for open", () => {
diff --git a/packages/socket/src/socketwrapper.spec.ts b/packages/socket/src/socketwrapper.spec.ts
@@ -1,3 +1,5 @@
+import { sleep } from "@cosmjs/utils";
+
 import { SocketWrapper } from "./socketwrapper";
 
 const enabled = !!globalThis.process?.env.SOCKETSERVER_ENABLED;
@@ -314,7 +316,8 @@ const enabled = !!globalThis.process?.env.SOCKETSERVER_ENABLED;
     );
     socket.connect();
 
-    setTimeout(() => socket.send("Hello world"), 2 * timeoutPeriodLength);
+    await sleep(2 * timeoutPeriodLength);
+    await socket.send("Hello world");
 
     return ret;
   });
diff --git a/packages/stargate/src/stargateclient.ts b/packages/stargate/src/stargateclient.ts
@@ -466,18 +466,9 @@ export class StargateClient {
 
     const transactionId = await this.broadcastTxSync(tx);
 
-    return new Promise((resolve, reject) =>
-      pollForTx(transactionId).then(
-        (value) => {
-          clearTimeout(txPollTimeout);
-          resolve(value);
-        },
-        (error) => {
-          clearTimeout(txPollTimeout);
-          reject(error);
-        },
-      ),
-    );
+    return pollForTx(transactionId).finally(() => {
+      clearTimeout(txPollTimeout);
+    });
   }
 
   /**
diff --git a/packages/stream/package.json b/packages/stream/package.json
@@ -44,6 +44,7 @@
     "xstream": "^11.14.0"
   },
   "devDependencies": {
+    "@cosmjs/utils": "workspace:^",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@types/jasmine": "^4",
     "@types/karma-firefox-launcher": "^2",
diff --git a/packages/stream/src/concat.spec.ts b/packages/stream/src/concat.spec.ts
@@ -1,9 +1,10 @@
+import { sleep } from "@cosmjs/utils";
 import { Producer, Stream } from "xstream";
 
 import { concat } from "./concat";
 
 async function producerIsStopped(): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, 50));
+  return sleep(50);
 }
 
 describe("concat", () => {
@@ -250,41 +251,41 @@ describe("concat", () => {
 
     expect(producerActiveLog).toEqual([true]);
 
+    await sleep(3.75 * intervalDuration);
+
     // unsubscribe
-    setTimeout(async () => {
-      expect(producerActiveLog).toEqual([true]);
-      subscription.unsubscribe();
-      await producerIsStopped();
-      expect(producerActiveLog).toEqual([true, false]);
-    }, 3.75 * intervalDuration);
+    expect(producerActiveLog).toEqual([true]);
+    subscription.unsubscribe();
+    await producerIsStopped();
+    expect(producerActiveLog).toEqual([true, false]);
+
+    await sleep(2.2 * intervalDuration);
 
     // re-subscribe
-    setTimeout(() => {
-      expect(producerActiveLog).toEqual([true, false]);
-
-      const subscription2 = concatenatedStream.subscribe({
-        next: (value) => {
-          expect(value).toEqual(expected.shift()!);
-        },
-        complete: () => {
-          done.fail();
-        },
-        error: done.fail,
-      });
-
-      expect(producerActiveLog).toEqual([true, false, true]);
-
-      // unsubscribe again
-      setTimeout(async () => {
-        expect(producerActiveLog).toEqual([true, false, true]);
-        subscription2.unsubscribe();
-        await producerIsStopped();
-        expect(producerActiveLog).toEqual([true, false, true, false]);
+    expect(producerActiveLog).toEqual([true, false]);
 
-        expect(expected.length).toEqual(0);
-        done();
-      }, 3.75 * intervalDuration);
-    }, 6 * intervalDuration);
+    const subscription2 = concatenatedStream.subscribe({
+      next: (value) => {
+        expect(value).toEqual(expected.shift()!);
+      },
+      complete: () => {
+        done.fail();
+      },
+      error: done.fail,
+    });
+
+    expect(producerActiveLog).toEqual([true, false, true]);
+
+    await sleep(3.75 * intervalDuration);
+
+    // unsubscribe again
+    expect(producerActiveLog).toEqual([true, false, true]);
+    subscription2.unsubscribe();
+    await producerIsStopped();
+    expect(producerActiveLog).toEqual([true, false, true, false]);
+
+    expect(expected.length).toEqual(0);
+    done();
 
     return ret;
   });
diff --git a/packages/stream/src/defaultvalueproducer.spec.ts b/packages/stream/src/defaultvalueproducer.spec.ts
@@ -1,9 +1,10 @@
+import { sleep } from "@cosmjs/utils";
 import { Stream } from "xstream";
 
 import { DefaultValueProducer } from "./defaultvalueproducer";
 
 async function oneTickLater(): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, 0));
+  return sleep(0);
 }
 
 describe("DefaultValueProducer", () => {
diff --git a/packages/stream/src/promise.spec.ts b/packages/stream/src/promise.spec.ts
@@ -1,10 +1,11 @@
+import { sleep } from "@cosmjs/utils";
 import { Producer, Stream } from "xstream";
 
 import { firstEvent, fromListPromise, toListPromise } from "./promise";
 import { asArray, countStream } from "./reducer";
 
 async function oneTickLater(): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, 0));
+  return sleep(0);
 }
 
 describe("promise", () => {
diff --git a/packages/stream/src/valueandupdates.spec.ts b/packages/stream/src/valueandupdates.spec.ts
@@ -1,3 +1,4 @@
+import { sleep } from "@cosmjs/utils";
 import { Listener } from "xstream";
 
 import { DefaultValueProducer } from "./defaultvalueproducer";
@@ -183,15 +184,12 @@ describe("ValueAndUpdates", () => {
       },
     });
 
-    setTimeout(() => {
-      producer.update(22);
-    }, 10);
-    setTimeout(() => {
-      producer.update(33);
-    }, 20);
-    setTimeout(() => {
-      producer.update(44);
-    }, 30);
+    await sleep(10);
+    producer.update(22);
+    await sleep(10);
+    producer.update(33);
+    await sleep(10);
+    producer.update(44);
 
     return ret;
   });
diff --git a/packages/tendermint-rpc/src/rpcclients/websocketclient.spec.ts b/packages/tendermint-rpc/src/rpcclients/websocketclient.spec.ts
@@ -187,27 +187,15 @@ import { WebsocketClient } from "./websocketclient";
   });
 
   it("fails when listening to a disconnected client", async () => {
-    let done!: (() => void) & { fail: (e?: any) => void };
-    const ret = new Promise<void>((resolve, reject) => {
-      done = resolve as typeof done;
-      done.fail = reject;
-    });
-
-    // async and done does not work together with pending() in Jasmine 2.8
-    (async () => {
-      const client = new WebsocketClient(tendermintUrl);
-      // dummy command to ensure client is connected
-      await client.execute(createJsonRpcRequest("health"));
-
-      client.disconnect();
+    const client = new WebsocketClient(tendermintUrl);
+    // dummy command to ensure client is connected
+    await client.execute(createJsonRpcRequest("health"));
 
-      const query = "tm.event='NewBlockHeader'";
-      const req = createJsonRpcRequest("subscribe", { query: query });
-      expect(() => client.listen(req).subscribe({})).toThrowError(/socket has disconnected/i);
-      done();
-    })().catch(done.fail);
+    client.disconnect();
 
-    return ret;
+    const query = "tm.event='NewBlockHeader'";
+    const req = createJsonRpcRequest("subscribe", { query: query });
+    expect(() => client.listen(req).subscribe({})).toThrowError(/socket has disconnected/i);
   });
 
   it("cannot listen to simple requests", async () => {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
	`1`	`+import { sleep } from "@cosmjs/utils";`
`1`	`2`	`import { Stream } from "xstream";`
`2`	`3`
`3`	`4`	`import { DefaultValueProducer } from "./defaultvalueproducer";`
`4`	`5`
`5`	`6`	`async function oneTickLater(): Promise<void> {`
`6`		`- return new Promise((resolve) => setTimeout(resolve, 0));`
	`7`	`+ return sleep(0);`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`describe("DefaultValueProducer", () => {`