#122 fixed final check

scaffold-eth · Jan 21, 2022 · 75e06f2 · 75e06f2
1 parent d58e02f
commit 75e06f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/helpers/test-utils/eth/hardhatActions.ts b/src/helpers/test-utils/eth/hardhatActions.ts
@@ -20,10 +20,10 @@ export const mineBlockUntil = async (
 ): Promise<[success: boolean, currentBlockNumber: number]> => {
   let currentBlockNumber = await mockProvider.getBlockNumber();
   const initialBlockNumber = currentBlockNumber;
-  while (!(await untilCondition(currentBlockNumber)) && maxNumberOfBlocks > currentBlockNumber - initialBlockNumber) {
-    console.log('update', currentBlockNumber, initialBlockNumber, maxNumberOfBlocks);
+  while (!(await untilCondition(currentBlockNumber)) && maxNumberOfBlocks >= currentBlockNumber - initialBlockNumber) {
     await mineBlock(mockProvider);
     currentBlockNumber = await mockProvider.getBlockNumber();
+    console.log('update', currentBlockNumber, initialBlockNumber, maxNumberOfBlocks);
   }
 
   console.log('after', await mockProvider.getBlockNumber());

diff --git a/test/useContractReader.test.ts b/test/useContractReader.test.ts
@@ -170,7 +170,7 @@ describe('useContractReader', function () {
 
       it.only('When given options of block number interval to update; then the hook does not update until that amount of blocks has passed', async () => {
         // Given
-        const finalPurpose = 'purpose 1';
+        const finalPurpose = 'final purpose';
         const blockIntervalToUpdate = 5;
 
         const updateOptions = { blockNumberInterval: blockIntervalToUpdate };
@@ -179,15 +179,18 @@ describe('useContractReader', function () {
         );
 
         await yourContract?.setPurpose(finalPurpose);
+        // check if the hardhat has final vlaue
         await mochaWaitFor(
           async () => (await yourContract?.purpose()) === finalPurpose,
           defaultBlockWaitOptions.timeout
         );
 
+        console.log(await yourContract?.purpose());
+
         // -- mine blocks up to block when update should occur
         const [success, updateBlockNumber] = await mineBlockUntil(
           wrapper.mockProvider,
-          blockIntervalToUpdate + 5,
+          blockIntervalToUpdate,
           async (currentBlockNumber): Promise<boolean> => {
             wrapper.mockProvider.blockNumber;
             if (currentBlockNumber === blockIntervalToUpdate + testStartBockNumber) {
@@ -198,7 +201,7 @@ describe('useContractReader', function () {
         );
 
         expect(success).to.be.true;
-        expect(updateBlockNumber).to.be.equal(testStartBockNumber + blockIntervalToUpdate);
+        expect(updateBlockNumber).to.be.equal(testStartBockNumber + 1 + blockIntervalToUpdate);
       });
 
       it('When given option for refetchInterval; then ensures result is not returned before refetchInterval', async () => {