Skip to content

Commit 7a1fd58

Browse files
committed
fix: ci
1 parent 74ae9b6 commit 7a1fd58

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

contracts/near/.buildkite/pipeline.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
steps:
22
- command: |
33
source ~/.cargo/env
4-
rustup default stable
4+
rustup install 1.86.0
5+
rustup default 1.86.0
6+
rustup target add wasm32-unknown-unknown
57
ci/test_verify_eth_headers.sh
68
79
label: "verify eth headers"
@@ -10,7 +12,9 @@ steps:
1012
1113
- command: |
1214
source ~/.cargo/env
13-
rustup default stable
15+
rustup install 1.86.0
16+
rustup default 1.86.0
17+
rustup target add wasm32-unknown-unknown
1418
ci/test_verify_eth_proofs.sh
1519
1620
label: "verify eth proofs"
@@ -19,7 +23,9 @@ steps:
1923
2024
- command: |
2125
source ~/.cargo/env
22-
rustup default stable
26+
rustup install 1.86.0
27+
rustup default 1.86.0
28+
rustup target add wasm32-unknown-unknown
2329
eth-client/test.sh
2430
2531
label: "eth-client tests"
@@ -28,14 +34,20 @@ steps:
2834
2935
- command: |
3036
source ~/.cargo/env
31-
rustup default stable
37+
rustup install 1.86.0
38+
rustup default 1.86.0
39+
rustup target add wasm32-unknown-unknown
3240
eth-prover/test.sh
3341
3442
label: "eth-prover tests"
3543
agents:
3644
- "queue=medium"
3745
3846
- command: |
47+
source ~/.cargo/env
48+
rustup install 1.86.0
49+
rustup default 1.86.0
50+
rustup target add wasm32-unknown-unknown
3951
./build_all.sh
4052
changed_files=$$(git status --porcelain --untracked-files=no | wc -l)
4153
if [ $$changed_files -gt 0 ]; then
@@ -49,6 +61,9 @@ steps:
4961
5062
- command: |
5163
source ~/.cargo/env
64+
rustup install 1.86.0
65+
rustup default 1.86.0
66+
rustup target add wasm32-unknown-unknown
5267
cargo test
5368
5469
label: "rust contracts test"

contracts/near/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ authors = ["Near One <info@nearone.org>"]
33
repository = "https://github.com/Near-One/rainbow-bridge"
44

55
[workspace]
6+
resolver = "2"
67
members = [
78
"eth2-client",
89
"eth-prover",

contracts/near/eth2-client/src/tests/unit_tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mod tests {
55
use eth_types::eth2::LightClientUpdate;
66
use eth_types::BlockHeader;
77
use near_sdk::test_utils::VMContextBuilder;
8-
use near_sdk::{test_vm_config, testing_env, AccountId};
8+
use near_sdk::{test_vm_config, testing_env, AccountId, Gas};
99

1010
macro_rules! inner_set_env {
1111
($builder:ident) => {
@@ -28,8 +28,8 @@ mod tests {
2828
let mut vm_config = test_vm_config();
2929
vm_config.limit_config.max_number_logs = u64::MAX;
3030
vm_config.limit_config.max_total_log_length = u64::MAX;
31-
vm_config.limit_config.max_total_prepaid_gas = u64::MAX;
32-
vm_config.limit_config.max_gas_burnt = u64::MAX;
31+
vm_config.limit_config.max_total_prepaid_gas = Gas::from_gas(u64::MAX);
32+
vm_config.limit_config.max_gas_burnt = Gas::from_gas(u64::MAX);
3333
testing_env!(builder.build(), vm_config);
3434
};
3535
}

0 commit comments

Comments
 (0)