test: update e2e-tests

Author: 1cedrus

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

@@ -28,29 +28,6 @@ describe('useContractQuery', () => {
       expect(totalSupply.current.data).toEqual(BigInt(1e20));
       expect(totalSupply.current.isLoading).toEqual(false);
     });
-
-    totalSupply.current.refresh();
-
-    await waitFor(() => {
-      expect(totalSupply.current.isRefreshing).toEqual(true);
-    });
-
-    await waitFor(() => {
-      expect(totalSupply.current.data).toEqual(BigInt(1e20));
-      expect(totalSupply.current.isRefreshing).toEqual(false);
-    });
-
-    const { result: balanceOf } = renderHook(
-      () => useContractQuery({ contract, args: ['0x_FAKE_'], fn: 'psp22BalanceOf' }),
-      {
-        wrapper,
-      },
-    );
-    await waitFor(() => {
-      expect(balanceOf.current.error).toBeDefined();
-    });
-
-    console.log('Error:', balanceOf.current.error);
   });
 
   it('should dry run successfully', async () => {
@@ -89,7 +66,6 @@ describe('useContractQuery', () => {
     });
 
     const beforeTranfer = balanceOf.current.data!;
-
     console.log('Before transfer:', beforeTranfer);
 
     const { result: transfer } = renderHook(

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

@@ -0,0 +1,75 @@
+import { beforeAll, describe, expect, it } from 'vitest';
+import { ALICE, BOB, deployPsp22Contract, psp22Metadata, wrapper } from '../utils';
+import { numberToHex } from 'dedot/utils';
+import { renderHook, waitFor } from '@testing-library/react';
+import { useContractQuery, useContractTx } from 'typink';
+import { Contract } from 'dedot/contracts';
+import { Psp22ContractApi } from 'contracts/psp22';
+
+describe('useContractQuery_2', () => {
+  let contractAddress: string, contract: Contract<Psp22ContractApi>;
+  beforeAll(async () => {
+    const randomSalt = numberToHex(Date.now());
+    contractAddress = await deployPsp22Contract(randomSalt);
+    console.log('Deployed contract address', contractAddress);
+    contract = new Contract<Psp22ContractApi>(client, psp22Metadata, contractAddress, { defaultCaller: ALICE });
+  });
+
+  it('should define error when errors occured', async () => {
+    const { result: balanceOf } = renderHook(
+      () => useContractQuery({ contract, args: ['0x__FAKE'], fn: 'psp22BalanceOf' }),
+      { wrapper },
+    );
+
+    await waitFor(() => {
+      expect(balanceOf.current.error).toBeDefined();
+    });
+
+    console.log('Error:', balanceOf.current.error);
+  });
+
+  it('should run refresh correctly', async () => {
+    const { result: balanceOf } = renderHook(
+      () => useContractQuery({ contract, args: [ALICE], fn: 'psp22BalanceOf' }),
+      { wrapper },
+    );
+
+    await waitFor(() => {
+      expect(balanceOf.current.data).toBeDefined();
+    });
+
+    const beforeTranfer = balanceOf.current.data!;
+
+    console.log('Before transfer:', beforeTranfer);
+
+    const { result: transfer } = renderHook(
+      () => useContractTx(contract, 'psp22Transfer'), // prettier-end-here
+      { wrapper },
+    );
+
+    await new Promise<void>((resolve) => {
+      transfer.current.signAndSend({
+        args: [BOB, BigInt(1e12), '0x'],
+        callback: ({ status }) => {
+          if (status.type === 'Finalized') {
+            resolve();
+          }
+        },
+      });
+    });
+
+    console.log('Transfer completed!');
+
+    balanceOf.current.refresh();
+
+    await waitFor(() => {
+      expect(balanceOf.current.isRefreshing).toEqual(true);
+    });
+
+    await waitFor(() => {
+      expect(balanceOf.current.isRefreshing).toEqual(false);
+      expect(balanceOf.current.data).toBeDefined();
+      expect(balanceOf.current.data).toEqual(beforeTranfer - BigInt(1e12));
+    });
+  });
+});

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);
@@ -151,4 +151,3 @@ export function useContractQuery<
     error,
   } as any;
 }
-