rebase

godwokenrises · Apr 29, 2022 · a22bc9f · a22bc9f
1 parent 11b9dbb
commit a22bc9f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/devtools/ci/integration-test.sh b/devtools/ci/integration-test.sh
@@ -15,8 +15,8 @@ else
     git clone --depth=1 https://github.com/nervosnetwork/godwoken.git $GODWOKEN_DIR
 fi
 cd $GODWOKEN_DIR
-# checkout https://github.com/nervosnetwork/godwoken/pull/659/head
-git fetch origin 8d32a46d4abc36dcf1d9dccd3ac5f69d050c246e
+# checkout https://github.com/nervosnetwork/godwoken/pull/675/merge
+git fetch origin pull/675/merge
 git checkout FETCH_HEAD 
 git submodule update --init --recursive --depth=1
 

diff --git a/polyjuice-tests/Cargo.lock b/polyjuice-tests/Cargo.lock
diff --git a/polyjuice-tests/src/test_cases/error.rs b/polyjuice-tests/src/test_cases/error.rs
@@ -21,7 +21,7 @@ fn test_error_handling() {
     // init accounts
     let from_eth_address = [1u8; 20];
     let (from_id, _from_script_hash) =
-        helper::create_eth_eoa_account(&mut state, &from_eth_address, 400000);
+        helper::create_eth_eoa_account(&mut state, &from_eth_address, 400000u64.into());
 
     // deploy Error contract
     let run_result = helper::deploy(