rename test.sh to localnet.sh

zeta-chain · Nov 16, 2024 · 57ceeb8 · 57ceeb8
1 parent 44f7d72
commit 57ceeb8
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 227 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -39,5 +39,5 @@ jobs:
         run: |
           cd "${{ matrix.example-dir }}"
           yarn
-          chmod +x ./scripts/test.sh
-          ./scripts/test.sh localnet
+          chmod +x ./scripts/localnet.sh
+          ./scripts/localnet.sh start
diff --git a/examples/call/contracts/Connected.sol b/examples/call/contracts/Connected.sol
@@ -22,6 +22,14 @@ contract Connected {
         gateway = GatewayEVM(gatewayAddress);
     }
 
+    function call(
+        address receiver,
+        bytes calldata message,
+        RevertOptions memory revertOptions
+    ) external {
+        gateway.call(receiver, message, revertOptions);
+    }
+
     function deposit(
         address receiver,
         RevertOptions memory revertOptions
@@ -60,14 +68,6 @@ contract Connected {
         gateway.depositAndCall(receiver, amount, asset, message, revertOptions);
     }
 
-    function call(
-        address receiver,
-        bytes calldata message,
-        RevertOptions memory revertOptions
-    ) external {
-        gateway.call(receiver, message, revertOptions);
-    }
-
     function depositAndCall(
         address receiver,
         bytes calldata message,

diff --git a/examples/call/contracts/Universal.sol b/examples/call/contracts/Universal.sol
@@ -22,6 +22,22 @@ contract Universal is UniversalContract {
         gateway = GatewayZEVM(gatewayAddress);
     }
 
+    function call(
+        bytes memory receiver,
+        address zrc20,
+        bytes calldata message,
+        CallOptions memory callOptions,
+        RevertOptions memory revertOptions
+    ) external {
+        (, uint256 gasFee) = IZRC20(zrc20).withdrawGasFeeWithGasLimit(
+            callOptions.gasLimit
+        );
+        if (!IZRC20(zrc20).transferFrom(msg.sender, address(this), gasFee))
+            revert TransferFailed();
+        IZRC20(zrc20).approve(address(gateway), gasFee);
+        gateway.call(receiver, zrc20, message, callOptions, revertOptions);
+    }
+
     function withdraw(
         bytes memory receiver,
         uint256 amount,
@@ -46,22 +62,6 @@ contract Universal is UniversalContract {
         gateway.withdraw(receiver, amount, zrc20, revertOptions);
     }
 
-    function call(
-        bytes memory receiver,
-        address zrc20,
-        bytes calldata message,
-        CallOptions memory callOptions,
-        RevertOptions memory revertOptions
-    ) external {
-        (, uint256 gasFee) = IZRC20(zrc20).withdrawGasFeeWithGasLimit(
-            callOptions.gasLimit
-        );
-        if (!IZRC20(zrc20).transferFrom(msg.sender, address(this), gasFee))
-            revert TransferFailed();
-        IZRC20(zrc20).approve(address(gateway), gasFee);
-        gateway.call(receiver, zrc20, message, callOptions, revertOptions);
-    }
-
     function withdrawAndCall(
         bytes memory receiver,
         uint256 amount,

diff --git a/examples/call/scripts/test.sh → examples/call/scripts/localnet.sh b/examples/call/scripts/test.sh → examples/call/scripts/localnet.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" = "localnet" ]; then npx hardhat localnet --exit-on-error & sleep 10; fi
+if [ "$1" = "start" ]; then npx hardhat localnet --exit-on-error & sleep 10; fi
 
 echo -e "\n🚀 Compiling contracts..."
 npx hardhat compile --force --quiet
@@ -105,4 +105,4 @@ npx hardhat universal-withdraw-and-call \
 
 npx hardhat localnet-check
 
-if [ "$1" = "localnet" ]; then npx hardhat localnet-stop; fi
+if [ "$1" = "start" ]; then npx hardhat localnet-stop; fi
diff --git a/examples/hello/scripts/test.sh b/examples/hello/scripts/test.sh
diff --git a/examples/nft/scripts/test.sh b/examples/nft/scripts/test.sh
diff --git a/examples/swap/scripts/test.sh b/examples/swap/scripts/test.sh
diff --git a/examples/token/scripts/test.sh b/examples/token/scripts/test.sh