From a22bc9fa3ab87e5f0bb5cbe268d6a6232e08ad50 Mon Sep 17 00:00:00 2001 From: "zero.qn" Date: Fri, 29 Apr 2022 16:15:11 +0800 Subject: [PATCH] rebase --- devtools/ci/integration-test.sh | 4 ++-- polyjuice-tests/Cargo.lock | 2 +- polyjuice-tests/src/test_cases/error.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devtools/ci/integration-test.sh b/devtools/ci/integration-test.sh index c5af87f8..aeadba8d 100644 --- 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 index 7aea6330..0296063f 100644 --- a/polyjuice-tests/Cargo.lock +++ b/polyjuice-tests/Cargo.lock @@ -733,6 +733,7 @@ dependencies = [ "gw-hash", "gw-types", "merkle-cbt", + "primitive-types", "sparse-merkle-tree", "thiserror", ] @@ -869,7 +870,6 @@ dependencies = [ "ckb-types", "gw-hash", "molecule", - "primitive-types", "sparse-merkle-tree", ] diff --git a/polyjuice-tests/src/test_cases/error.rs b/polyjuice-tests/src/test_cases/error.rs index 2d117a5d..c8b6c6d9 100644 --- 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(