imp(e2e): removed 'e2e/artifacts' (#35)

cosmos · Aug 14, 2024 · 7d23401 · 7d23401
1 parent f1dffcc
commit 7d23401
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 22 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -51,19 +51,32 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
-
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
           go-version: "1.22"
           check-latest: true
           cache-dependency-path: "e2e/interchaintestv8/go.sum"
-
       - name: "Install Bun"
         uses: "oven-sh/setup-bun@v2"
-
       - name: "Install the Node.js dependencies"
         run: bun install
+      - name: Install rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - name: Install SP1 toolchain
+        run: |
+          curl -L https://sp1.succinct.xyz | bash
+          ~/.sp1/bin/sp1up 
+          ~/.sp1/bin/cargo-prove prove --version
+      - name: Install operator
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: --git https://github.com/cosmos/sp1-ics07-tendermint sp1-ics07-tendermint-operator --bin operator --locked
 
       - name: Run Tests
         env:

diff --git a/e2e/artifacts/darwin-aarch64/operator b/e2e/artifacts/darwin-aarch64/operator
diff --git a/e2e/artifacts/genesis.json b/e2e/artifacts/genesis.json
diff --git a/e2e/artifacts/linux-x86_64/operator b/e2e/artifacts/linux-x86_64/operator
diff --git a/e2e/interchaintestv8/ibc_eureka_test.go b/e2e/interchaintestv8/ibc_eureka_test.go
@@ -135,9 +135,13 @@ func (s *IbcEurekaTestSuite) SetupSuite(ctx context.Context) {
 		s.Require().NoError(operator.RunGenesis(
 			"--trust-level", testvalues.DefaultTrustLevel.String(),
 			"--trusting-period", strconv.Itoa(testvalues.DefaultTrustPeriod),
-			"-o", "e2e/artifacts/genesis.json",
+			"-o", "e2e/genesis.json",
 		))
 
+		s.T().Cleanup(func() {
+			_ = os.Remove("e2e/genesis.json")
+		})
+
 		var (
 			stdout []byte
 			stderr []byte

diff --git a/e2e/interchaintestv8/operator/operator.go b/e2e/interchaintestv8/operator/operator.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"os/exec"
-	"runtime"
 	"strconv"
 	"strings"
 
@@ -23,14 +22,7 @@ type membershipFixture struct {
 }
 
 func BinaryPath() string {
-	switch runtime.GOOS {
-	case "darwin":
-		return "e2e/artifacts/darwin-aarch64/operator"
-	case "linux":
-		return "e2e/artifacts/linux-x86_64/operator"
-	default:
-		panic("unsupported OS")
-	}
+	return "operator"
 }
 
 // RunGenesis is a function that runs the genesis script to generate genesis.json

diff --git a/script/E2ETestDeploy.s.sol b/script/E2ETestDeploy.s.sol
@@ -83,7 +83,7 @@ contract E2ETestDeploy is Script {
 
     function loadGenesis(string memory fileName) public view returns (SP1ICS07TendermintGenesisJson memory) {
         string memory root = vm.projectRoot();
-        string memory path = string.concat(root, "/e2e/artifacts/", fileName);
+        string memory path = string.concat(root, "/e2e/", fileName);
         string memory json = vm.readFile(path);
         bytes memory trustedClientState = json.readBytes(".trustedClientState");
         bytes memory trustedConsensusState = json.readBytes(".trustedConsensusState");

diff --git a/script/MockE2ETestDeploy.s.sol b/script/MockE2ETestDeploy.s.sol
@@ -82,7 +82,7 @@ contract MockE2ETestDeploy is Script {
 
     function loadGenesis(string memory fileName) public view returns (SP1ICS07TendermintGenesisJson memory) {
         string memory root = vm.projectRoot();
-        string memory path = string.concat(root, "/e2e/artifacts/", fileName);
+        string memory path = string.concat(root, "/e2e/", fileName);
         string memory json = vm.readFile(path);
         bytes memory trustedClientState = json.readBytes(".trustedClientState");
         bytes memory trustedConsensusState = json.readBytes(".trustedConsensusState");