Merge pull request #96 from semiotic-ai/suchapalaver/fix/integration-test

fix: integration test

Author: suchapalaver

.github/workflows/test.yml

@@ -36,3 +36,40 @@ jobs:
         run: |
           forge test -vvv
         id: test
+
+  integration-tests:
+    name: Integration Tests
+    runs-on: ubuntu-latest
+    needs: check
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Setup Node.js and install nvm
+        run: |
+          curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+          export NVM_DIR="$HOME/.nvm"
+          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+          
+          # Install Node 16 and yarn for Graph contracts
+          nvm install 16
+          nvm use 16
+          npm install -g yarn
+          
+          # Install Node 18 and yarn for TAP contracts  
+          nvm install 18
+          nvm use 18
+          npm install -g yarn
+
+      - name: Run Integration Tests
+        run: |
+          export NVM_DIR="$HOME/.nvm"
+          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+          chmod +x scripts/integration_tests.sh
+          ./scripts/integration_tests.sh --run-integration-tests

package.json

@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "prettier": "^2.8.8",
-    "prettier-plugin-solidity": "^1.1.3",
+    "prettier-plugin-solidity": "^2.0.0",
     "solhint": "^3.4.0",
     "solhint-plugin-prettier": "^0.0.5"
   },

scripts/integration_tests.sh

@@ -62,6 +62,11 @@ deploy_graph_contracts() {
     # Hardhat requires an older version of node
     nvm install 16.0.0
     nvm use 16.0.0
+    # Install yarn if not available
+    if ! command -v yarn &> /dev/null; then
+        echo "Installing yarn for Node 16.0.0..."
+        npm install -g yarn
+    fi
     yarn
     yes | yarn deploy-localhost --auto-mine
     export GRAPH_NODE_ADDRESS="$(jq '.["1337"].GraphToken.address' addresses.json | tr -d '"' || error_exit "Error obtaining Graph Node address")"
@@ -74,22 +79,33 @@ deploy_graph_contracts() {
 deploy_tap_contracts() {
     cd "$tap_contracts"
     echo "Starting deploy for TAP contracts located in $PWD"
+    # Switch back to a newer Node version for TAP contracts
+    nvm install 18
+    nvm use 18
+    # Install yarn if not available in Node 18
+    if ! command -v yarn &> /dev/null; then
+        echo "Installing yarn for Node 18..."
+        npm install -g yarn
+    fi
+
     export WITHDRAW_ESCROW_FREEZE_PERIOD=800
     export REVOKE_SIGNER_FREEZE_PERIOD=800
+    # Set dummy ETHERSCAN_API_KEY to avoid verification errors
+    export ETHERSCAN_API_KEY="dummy_key_for_local_testing"
     yarn
     export ALLOCATION_TRACKER_ADDRESS=$(forge create \
         --unlocked --from $DEPLOYER \
-        --rpc-url localhost:8545 src/AllocationIDTracker.sol:AllocationIDTracker --json \
+        --rpc-url localhost:8545 src/AllocationIDTracker.sol:AllocationIDTracker --json --broadcast \
         | jq -Rr 'fromjson? | .deployedTo')
     export TAP_VERIFIER_ADDRESS=$(forge create \
         --unlocked --from $DEPLOYER \
         --rpc-url localhost:8545 src/TAPVerifier.sol:TAPVerifier \
-        --constructor-args 'tapVerifier' '1.0' --json \
+        --constructor-args 'tapVerifier' '1.0' --json --broadcast \
         | jq -Rr 'fromjson? | .deployedTo')
     export ESCROW_ADDRESS=$(forge create \
         --unlocked --from $DEPLOYER \
         --rpc-url localhost:8545 src/Escrow.sol:Escrow \
-        --constructor-args $GRAPH_NODE_ADDRESS $STAKING_ADDRESS $TAP_VERIFIER_ADDRESS $ALLOCATION_TRACKER_ADDRESS $WITHDRAW_ESCROW_FREEZE_PERIOD $REVOKE_SIGNER_FREEZE_PERIOD --json \
+        --constructor-args $GRAPH_NODE_ADDRESS $STAKING_ADDRESS $TAP_VERIFIER_ADDRESS $ALLOCATION_TRACKER_ADDRESS $WITHDRAW_ESCROW_FREEZE_PERIOD $REVOKE_SIGNER_FREEZE_PERIOD --json --broadcast \
         | jq -Rr 'fromjson? | .deployedTo')
     echo "TAP contracts deployed"
     cd -
@@ -105,6 +121,8 @@ main() {
 
     if $RUN_INTEGRATION_TESTS; then
         echo "Running integration tests..."
+        # Set ETHERSCAN_API_KEY for testing to avoid verification errors
+        export ETHERSCAN_API_KEY="dummy_key_for_local_testing"
         #run integration tests...
         forge test --match-contract EscrowContractTest --rpc-url localhost:8545
     else

test/Escrow.t.sol

@@ -597,7 +597,7 @@ contract EscrowContractTest is Test {
         vm.expectRevert(
             abi.encodeWithSignature(
                 "SignerStillThawing(uint256,uint256)",
-                block.number,
+                block.timestamp,
                 thawEndTimestamp
             )
         );