Remove sandbox and update aurora-workspace to 0.4.0

Near-One · Nov 8, 2023 · 4c0ddf8 · 4c0ddf8
1 parent 6ab6701
commit 4c0ddf8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,29 +13,16 @@ jobs:
     runs-on: [self-hosted, heavy]
     steps:
       - name: Clone the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Restore cache
         run: |
-          cache-util restore cargo_git cargo_registry sandbox:${{ env.NEAR_SANDBOX_BIN_PATH }}
-      - name: Install sandbox
-        run: |
-          if [[ ! -f ${{ env.NEAR_SANDBOX_BIN_PATH }} ]]; then
-            rm -rf nearcore
-            git clone --depth 1 --branch 1.35.0 https://github.com/near/nearcore
-            cd nearcore
-            make sandbox-release
-            cp target/release/near-sandbox $HOME/bin/
-            cache-util save sandbox:${{ env.NEAR_SANDBOX_BIN_PATH }}          
-            cd ../
-            rm -rf nearcore
-          fi
+          cache-util restore cargo_git cargo_registry
       - name: Test mainnet
         run: cargo make --profile mainnet test
       - name: Save cache
         run: |
           cache-util save cargo_git cargo_registry
 
 env:
-  NEAR_SANDBOX_BIN_PATH: /usr/local/bin/near-sandbox
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0
diff --git a/Makefile.toml b/Makefile.toml
@@ -172,6 +172,7 @@ category = "Test"
 command = "${CARGO}"
 args = [
     "test",
+    "test_migration",
     "--features",
     "${CARGO_FEATURES_TEST}",
     "--",

diff --git a/eth-connector-tests/Cargo.toml b/eth-connector-tests/Cargo.toml
@@ -20,15 +20,15 @@ near-sdk = "4.1"
 near-primitives = "0.17"
 near-units = "0.2"
 near-contract-standards = "4.1"
-tokio = { version = "1", features = ["full"] }
+# tokio = { version = "1", features = ["full"] }
 workspaces = "0.7.0"
 byte-slice-cast = "1.2"
 hex = "0.4.3"
 ethabi = "18.0"
 rlp = { version = "0.5.0", default-features = false }
 aurora-engine-migration-tool = { git = "https://github.com/aurora-is-near/aurora-engine-migration-tool.git" }
-aurora-workspace-eth-connector = { git = "https://github.com/aurora-is-near/aurora-workspace.git", tag = "0.3.1" }
-aurora-workspace-utils = { git = "https://github.com/aurora-is-near/aurora-workspace.git", tag = "0.3.1" }
+aurora-workspace-eth-connector = { git = "https://github.com/aurora-is-near/aurora-workspace.git", tag = "0.4.0" }
+aurora-workspace-utils = { git = "https://github.com/aurora-is-near/aurora-workspace.git", tag = "0.4.0" }
 
 [features]
 migration-tests = []
diff --git a/eth-connector-tests/src/migration.rs b/eth-connector-tests/src/migration.rs
@@ -30,6 +30,7 @@ async fn test_migration() {
         used_proofs: proof_keys,
         ..Default::default()
     };
+    //over truth crucial sweet soul truck merry vintage verify hungry slide prefer
     let res = contract
         .contract
         .migrate(data)

diff --git a/eth-connector-tests/src/utils.rs b/eth-connector-tests/src/utils.rs
@@ -39,6 +39,15 @@ impl TestContract {
         let prover_account = contract.id();
         let metadata = Self::metadata_default();
         let account_with_access_right: AccountId = CONTRACT_ACC.parse().unwrap();
+        println!("{prover_account:?}");
+        println!("{account_with_access_right:?}");
+        println!("{owner_id:?}");
+        println!("{eth_custodian_address:?}");
+        println!(
+            "{{\"spec\": {:?}, \"name\": {:?}, \"symbol\":{:?} }}",
+            metadata.spec, metadata.name, metadata.symbol
+        );
+
         // Init eth-connector
         let res = contract
             .init(