test: update e2e-tests

Author: 1cedrus

e2e/zombienet/src/hooks/useContractQuery.test.ts

@@ -5,7 +5,6 @@ import { renderHook, waitFor } from '@testing-library/react';
 import { useContractQuery, useContractTx, useRawContract } from 'typink';
 import { Contract } from 'dedot/contracts';
 import { Psp22ContractApi } from 'contracts/psp22';
-
 describe('useContractQuery', () => {
   let contractAddress: string, contract: Contract<Psp22ContractApi>;
   beforeAll(async () => {
@@ -29,28 +28,37 @@ describe('useContractQuery', () => {
       expect(totalSupply.current.isLoading).toEqual(false);
     });
 
-    totalSupply.current.refresh();
+    const { result: balanceOf, rerender } = renderHook(
+      ({ address }) => useContractQuery({ contract, args: [address], fn: 'psp22BalanceOf' }),
+      {
+        wrapper,
+        initialProps: {
+          address: '0x__FAKE',
+        },
+      },
+    );
 
     await waitFor(() => {
-      expect(totalSupply.current.isRefreshing).toEqual(true);
+      expect(balanceOf.current.error).toBeDefined();
     });
 
+    console.log('Error:', balanceOf.current.error);
+
+    rerender({ address: ALICE });
+
     await waitFor(() => {
-      expect(totalSupply.current.data).toEqual(BigInt(1e20));
-      expect(totalSupply.current.isRefreshing).toEqual(false);
+      expect(balanceOf.current.data).toEqual(BigInt(1e20));
     });
 
-    const { result: balanceOf } = renderHook(
-      () => useContractQuery({ contract, args: ['0x_FAKE_'], fn: 'psp22BalanceOf' }),
-      {
-        wrapper,
-      },
-    );
+    balanceOf.current.refresh();
+
     await waitFor(() => {
-      expect(balanceOf.current.error).toBeDefined();
+      expect(balanceOf.current.isRefreshing).toEqual(true);
     });
 
-    console.log('Error:', balanceOf.current.error);
+    await waitFor(() => {
+      expect(balanceOf.current.isRefreshing).toEqual(false);
+    });
   });
 
   it('should dry run successfully', async () => {

packages/typink/src/hooks/useContractQuery.ts

@@ -14,7 +14,7 @@ type UseContractQueryReturnType<
   M extends keyof ContractQuery<T> = keyof ContractQuery<T>,
 > = {
   isLoading: boolean;
-  refresh: () => void;
+  refresh: () => Promise<void>;
   isRefreshing: boolean;
   error?: Error;
 } & Partial<Awaited<ReturnType<T['query'][M]>>>;
@@ -50,8 +50,8 @@ export function useContractQuery<
   } & Args<Pop<Parameters<T['query'][M]>>>,
 ): UseContractQueryReturnType<T, M> {
   // TODO replace loading tracking state with tanstack
-  
-  const { client } = useTypink(); 
+
+  const { client } = useTypink();
 
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const [isRefreshing, setIsRefreshing] = useState<boolean>(false);
@@ -101,11 +101,15 @@ export function useContractQuery<
     try {
       setIsRefreshing(true);
 
+      console.log('Refreshing query:', fn, args, options);
+
       const result = await contract.query[fn](...args, options);
 
       setResult(result);
       setError(undefined);
       setIsRefreshing(false);
+
+      console.log('[DONE]: Refreshing query: ', fn, args, options);
     } catch (error: any) {
       console.error('Error when refreshing the query:', error);
 
@@ -151,4 +155,3 @@ export function useContractQuery<
     error,
   } as any;
 }
-