test: 🐛 fix timeout bug

Moonsong-Labs · TDemeco · Oct 15, 2024 · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024
commit a225b39cc8dcf11ce19b2fb0ee859e9a13dcffe9
diff --git a/test/util/bspNet/waits.ts b/test/util/bspNet/waits.ts
@@ -30,7 +30,8 @@ export const waitForBspVolunteer = async (api: ApiPromise, checkQuantity?: numbe
       const matches = await assertExtrinsicPresent(api, {
         module: "fileSystem",
         method: "bspVolunteer",
-        checkTxPool: true
+        checkTxPool: true,
+        timeout: 100
       });
       if (checkQuantity) {
         invariant(
@@ -68,8 +69,8 @@ export const waitForBspVolunteerWithoutSealing = async (
   api: ApiPromise,
   checkQuantity?: number
 ) => {
-  const iterations = 41;
-  const delay = 50;
+  const iterations = 100;
+  const delay = 100;
 
   // To allow node time to react on chain events
   for (let i = 0; i < iterations; i++) {
@@ -78,7 +79,8 @@ export const waitForBspVolunteerWithoutSealing = async (
       const matches = await assertExtrinsicPresent(api, {
         module: "fileSystem",
         method: "bspVolunteer",
-        checkTxPool: true
+        checkTxPool: true,
+        timeout: 100
       });
       if (checkQuantity) {
         invariant(
@@ -120,7 +122,8 @@ export const waitForBspStored = async (api: ApiPromise, checkQuantity?: number)
       const matches = await assertExtrinsicPresent(api, {
         module: "fileSystem",
         method: "bspConfirmStoring",
-        checkTxPool: true
+        checkTxPool: true,
+        timeout: 100
       });
       if (checkQuantity) {
         invariant(
@@ -163,7 +166,8 @@ export const waitForBspStoredWithoutSealing = async (api: ApiPromise, checkQuant
       const matches = await assertExtrinsicPresent(api, {
         module: "fileSystem",
         method: "bspConfirmStoring",
-        checkTxPool: true
+        checkTxPool: true,
+        timeout: 100
       });
       if (checkQuantity) {
         invariant(

diff --git a/pallets/file-system/src/utils.rs b/pallets/file-system/src/utils.rs
    }};
    // Handle boolean type
    ($condition:expr, $error_msg:expr, $error_type:path, bool) => {{
        if !$condition {
            #[cfg(test)]
            unreachable!($error_msg);

diff --git a/node/src/tasks/user_sends_file.rs b/node/src/tasks/user_sends_file.rs

        // Iterates and tries to send file to peer.
        // Breaks loop after first successful attempt since all peer ids belong to the same provider.
        for peer_id in peer_ids {
            debug!(target: LOG_TARGET, "Attempting to send chunks of file key {:?} to peer {:?}", file_key, peer_id);

            for chunk_id in 0..chunk_count {
diff --git a/test/suites/integration/bsp/automatic-tipping.test.ts b/test/suites/integration/bsp/automatic-tipping.test.ts
      await api.wait.bspVolunteer();

      // Wait for the bsp to send the first confirm storing extrinsic
      await api.wait.bspStoredInTxPool();

      // Wait for the bsp to send all the confirm retries
      await sleep(6000);
diff --git a/test/suites/integration/bsp/challenge-cycle.test.ts b/test/suites/integration/bsp/challenge-cycle.test.ts
      const lastTickResult = await userApi.call.proofsDealerApi.getLastTickProviderSubmittedProof(
        userApi.shConsts.DUMMY_BSP_ID
      );
      assert(lastTickResult.isOk);
      const lastTickBspSubmittedProof = lastTickResult.asOk.toNumber();
      // Then we get the challenge period for the BSP.
      const challengePeriodResult = await userApi.call.proofsDealerApi.getChallengePeriod(
      const lastTickResult = await userApi.call.proofsDealerApi.getLastTickProviderSubmittedProof(
        userApi.shConsts.DUMMY_BSP_ID
      );
      assert(lastTickResult.isOk);
      const lastTickBspSubmittedProof = lastTickResult.asOk.toNumber();
      // Then we get the challenge period for the BSP.
      const challengePeriodResult = await userApi.call.proofsDealerApi.getChallengePeriod(
diff --git a/test/suites/integration/bsp/debt-collection.test.ts b/test/suites/integration/bsp/debt-collection.test.ts
          "fileSystem",
          "SpStopStoringInsolventUser"
        );
        strictEqual(
          spStopStoringForInsolventUserEvents.length,
          3,
          "There should be three stop storing for insolvent user events"
	}};
	// Handle boolean type
	($condition:expr, $error_msg:expr, $error_type:path, bool) => {{
	if !$condition {
Check warning on line 71 in pallets/file-system/src/utils.rs GitHub Actions / Check lint with clippy the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor, please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable Check warning on line 71 in pallets/file-system/src/utils.rs GitHub Actions / Check lint with clippy the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor, please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable
	#[cfg(test)]
	unreachable!($error_msg);

	// Iterates and tries to send file to peer.
	// Breaks loop after first successful attempt since all peer ids belong to the same provider.
	for peer_id in peer_ids {
Check warning on line 194 in node/src/tasks/user_sends_file.rs GitHub Actions / Check lint with clippy `this loop never actually loops`
	debug!(target: LOG_TARGET, "Attempting to send chunks of file key {:?} to peer {:?}", file_key, peer_id);

	for chunk_id in 0..chunk_count {
	await api.wait.bspVolunteer();

	// Wait for the bsp to send the first confirm storing extrinsic
	await api.wait.bspStoredInTxPool();
Check failure on line 19 in test/suites/integration/bsp/automatic-tipping.test.ts GitHub Actions / Run BSPNet Tests (1) Confirm storing failure results in increased tip Error [ERR_TEST_FAILURE]: Invariant failed: Failed to detect BSP storage confirmation extrinsic in txPool after 5s at async Promise.all (index 0) { code: 'ERR_TEST_FAILURE', failureType: 'testCodeFailure', cause: Error: Invariant failed: Failed to detect BSP storage confirmation extrinsic in txPool after 5s at invariant (file:///home/runner/work/storage-hub/storage-hub/node_modules/.pnpm/tiny-invariant@1.3.3/node_modules/tiny-invariant/dist/esm/tiny-invariant.js:12:11) at Module.waitForBspStoredWithoutSealing (/home/runner/work/storage-hub/storage-hub/test/util/bspNet/waits.ts:180:7) at process.processTicksAndRejections (node:internal/process/task_queues:105:5) at async TestContext.<anonymous> (/home/runner/work/storage-hub/storage-hub/test/suites/integration/bsp/automatic-tipping.test.ts:19:7) at async Test.run (node:internal/test_runner/test:931:9) at async Promise.all (index 0) at async Suite.run (node:internal/test_runner/test:1295:7) at async startSubtestAfterBootstrap (node:internal/test_runner/harness:289:3) }

	// Wait for the bsp to send all the confirm retries
	await sleep(6000);
	const lastTickResult = await userApi.call.proofsDealerApi.getLastTickProviderSubmittedProof(
	userApi.shConsts.DUMMY_BSP_ID
	);
	assert(lastTickResult.isOk);
Check failure on line 31 in test/suites/integration/bsp/challenge-cycle.test.ts GitHub Actions / Run BSPNet Tests (3) BSP is challenged and correctly submits proof [Error [ERR_TEST_FAILURE]: The expression evaluated to a falsy value: it("BSP is challenged and correctly submits proof", async () => { console.log(userApi.consts.system.version.specName.toString()); // Calculate the next challenge tick for the BSP. // We first get the last tick for which the BSP submitted a proof. const lastTickResult = await userApi.call.proofsDealerApi.getLastTickProviderSubmittedProof( userApi.shConsts.DUMMY_BSP_ID ); assert(lastTickResult.isOk); const lastTickBspSubmittedProof = lastTickResult.asOk.toNumber(); // Then we get the challenge period for the BSP. const challengePeriodResult = await userApi.call.proofsDealerApi.getChallengePeriod( userApi.shConsts.DUMMY_BSP_ID ); assert(challengePeriodResult.isOk); const challengePeriod = challengePeriodResult.asOk.toNumber(); // Then we calculate the next challenge tick. const nextChallengeTick = lastTickBspSubmittedProof + challengePeriod; // Calculate how many blocks to advance until next challenge tick. const currentBlockNumber = (await userApi.query.system.number()).toNumber(); const blocksToAdvance = nextChallengeTick - currentBlockNumber; // Advance blocksToAdvance blocks. for (let i = 0; i < blocksToAdvance; i++) { await userApi.sealBlock(); } // Wait for task to execute and seal one more block. // In this block, the BSP should have submitted a proof. await sleep(500); await userApi.sealBlock(); // Assert for the the event of the proof successfully submitted and verified. await userApi.assert.eventPresent("proofsDealer", "ProofAccepted"); }) ] { code: 'ERR_TEST_FAILURE', failureType: 'testCodeFailure', cause: AssertionError [ERR_ASSERTION]: The expression evaluated to a falsy value: it("BSP is challenged and correctly submits proof", async () => { console.log(userApi.consts.system.version.specName.toString()); // Calculate the next challenge tick for the BSP. // We first get the last tick for which the BSP submitted a proof. const lastTickResult = await userApi.call.proofsDealerApi.getLastTickProviderSubmittedProof( userApi.shConsts.DUMMY_BSP_ID ); assert(lastTickResult.isOk); const lastTickBspSubmittedProof = lastTickResult.asOk.toNumber(); // Then we get the challenge period for the BSP. const challengePeriodResult = await userApi.call.proofsDealerApi.getChallengePeriod( userApi.shConsts.DUMMY_BSP_ID ); assert(challengePeriodResult.isOk); const challengePeriod = challengePeriodResult.asOk.toNumber(); // Then we calculate the next challenge tick. const nextChallengeTick = lastTickBspSubmittedProof + challengePeriod; // Calculate how many blocks to advance until next challenge tick. const currentBlockNumber = (await userApi.query.system.number()).toNumber(); const blocksToAdvance = nextChallengeTick - currentBlockNumber; // Advance blocksToAdvance blocks. for (let i = 0; i < blocksToAdvance; i++) { await userApi.sealBlock(); } // Wait for task to execute and seal one more block. // In this block, the BSP should have submitted a proof. await sleep(500); await userApi.sealBlock(); // Assert for the the event of the proof successfully submitted and verified. await userApi.assert.eventPresent("proofsDealer", "ProofAccepted"); }) at TestContext.<anonymous> (/home/runner/work/storage-hub/storage-hub/test/suites/integration/bsp/challenge-cycle.test.ts:31:7) at process.processTicksAndRejections (node:internal/process/task_queues:105:5) at async Test.run (node:internal/test_runner/test:931:9) at async Suite.processPendingSubtests (node:internal/test_runner/test:629:7) { generatedMessage: true, code: 'ERR_ASSERTION', actual: false, expected: true, operator: '==' } }
	const lastTickBspSubmittedProof = lastTickResult.asOk.toNumber();
	// Then we get the challenge period for the BSP.
	const challengePeriodResult = await userApi.call.proofsDealerApi.getChallengePeriod(
	const lastTickResult = await userApi.call.proofsDealerApi.getLastTickProviderSubmittedProof(
	userApi.shConsts.DUMMY_BSP_ID
	);
	assert(lastTickResult.isOk);
Check failure on line 71 in test/suites/integration/bsp/challenge-cycle.test.ts GitHub Actions / Run BSPNet Tests (3) BSP fails to submit proof and is marked as slashable [Error [ERR_TEST_FAILURE]: The expression evaluated to a falsy value: it("BSP is challenged and correctly submits proof", async () => { console.log(userApi.consts.system.version.specName.toString()); // Calculate the next challenge tick for the BSP. // We first get the last tick for which the BSP submitted a proof. const lastTickResult = await userApi.call.proofsDealerApi.getLastTickProviderSubmittedProof( userApi.shConsts.DUMMY_BSP_ID ); assert(lastTickResult.isOk); const lastTickBspSubmittedProof = lastTickResult.asOk.toNumber(); // Then we get the challenge period for the BSP. const challengePeriodResult = await userApi.call.proofsDealerApi.getChallengePeriod( userApi.shConsts.DUMMY_BSP_ID ); assert(challengePeriodResult.isOk); const challengePeriod = challengePeriodResult.asOk.toNumber(); // Then we calculate the next challenge tick. const nextChallengeTick = lastTickBspSubmittedProof + challengePeriod; // Calculate how many blocks to advance until next challenge tick. const currentBlockNumber = (await userApi.query.system.number()).toNumber(); const blocksToAdvance = nextChallengeTick - currentBlockNumber; // Advance blocksToAdvance blocks. for (let i = 0; i < blocksToAdvance; i++) { await userApi.sealBlock(); } // Wait for task to execute and seal one more block. // In this block, the BSP should have submitted a proof. await sleep(500); await userApi.sealBlock(); // Assert for the the event of the proof successfully submitted and verified. await userApi.assert.eventPresent("proofsDealer", "ProofAccepted"); }) ] { code: 'ERR_TEST_FAILURE', failureType: 'testCodeFailure', cause: AssertionError [ERR_ASSERTION]: The expression evaluated to a falsy value: it("BSP is challenged and correctly submits proof", async () => { console.log(userApi.consts.system.version.specName.toString()); // Calculate the next challenge tick for the BSP. // We first get the last tick for which the BSP submitted a proof. const lastTickResult = await userApi.call.proofsDealerApi.getLastTickProviderSubmittedProof( userApi.shConsts.DUMMY_BSP_ID ); assert(lastTickResult.isOk); const lastTickBspSubmittedProof = lastTickResult.asOk.toNumber(); // Then we get the challenge period for the BSP. const challengePeriodResult = await userApi.call.proofsDealerApi.getChallengePeriod( userApi.shConsts.DUMMY_BSP_ID ); assert(challengePeriodResult.isOk); const challengePeriod = challengePeriodResult.asOk.toNumber(); // Then we calculate the next challenge tick. const nextChallengeTick = lastTickBspSubmittedProof + challengePeriod; // Calculate how many blocks to advance until next challenge tick. const currentBlockNumber = (await userApi.query.system.number()).toNumber(); const blocksToAdvance = nextChallengeTick - currentBlockNumber; // Advance blocksToAdvance blocks. for (let i = 0; i < blocksToAdvance; i++) { await userApi.sealBlock(); } // Wait for task to execute and seal one more block. // In this block, the BSP should have submitted a proof. await sleep(500); await userApi.sealBlock(); // Assert for the the event of the proof successfully submitted and verified. await userApi.assert.eventPresent("proofsDealer", "ProofAccepted"); }) at TestContext.<anonymous> (/home/runner/work/storage-hub/storage-hub/test/suites/integration/bsp/challenge-cycle.test.ts:71:7) at process.processTicksAndRejections (node:internal/process/task_queues:105:5) at async Test.run (node:internal/test_runner/test:931:9) at async Suite.processPendingSubtests (node:internal/test_runner/test:629:7) { generatedMessage: true, code: 'ERR_ASSERTION', actual: false, expected: true, operator: '==' } }
	const lastTickBspSubmittedProof = lastTickResult.asOk.toNumber();
	// Then we get the challenge period for the BSP.
	const challengePeriodResult = await userApi.call.proofsDealerApi.getChallengePeriod(
	"fileSystem",
	"SpStopStoringInsolventUser"
	);
	strictEqual(
Check failure on line 710 in test/suites/integration/bsp/debt-collection.test.ts GitHub Actions / Run BSPNet Tests (4) BSP correctly deletes all files from an insolvent user [Error [ERR_TEST_FAILURE]: There should be three stop storing for insolvent user events] { code: 'ERR_TEST_FAILURE', failureType: 'testCodeFailure', cause: AssertionError [ERR_ASSERTION]: There should be three stop storing for insolvent user events at TestContext.<anonymous> (/home/runner/work/storage-hub/storage-hub/test/suites/integration/bsp/debt-collection.test.ts:710:9) at process.processTicksAndRejections (node:internal/process/task_queues:105:5) at async Test.run (node:internal/test_runner/test:931:9) at async Suite.processPendingSubtests (node:internal/test_runner/test:629:7) { generatedMessage: false, code: 'ERR_ASSERTION', actual: 2, expected: 3, operator: 'strictEqual' } }
	spStopStoringForInsolventUserEvents.length,
	3,
	"There should be three stop storing for insolvent user events"