Skip to content

Commit 9f5caac

Browse files
authored
chore: Updated near-* dependendencies to v0.26.0. Migrated testing blockchain mock to C-unwind (#1244)
1 parent 9c68e71 commit 9f5caac

File tree

12 files changed

+74
-75
lines changed

12 files changed

+74
-75
lines changed

examples/adder/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
1111
near-sdk = { path = "../../near-sdk" }
1212

1313
[dev-dependencies]
14-
near-workspaces = "0.12"
14+
near-workspaces = "0.13"
1515
tokio = { version = "1.14", features = ["full"] }
1616
anyhow = "1.0"
1717
near-abi = "0.4.0"

examples/callback-results/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
1111
near-sdk = { path = "../../near-sdk" }
1212

1313
[dev-dependencies]
14-
near-workspaces = "0.12"
14+
near-workspaces = "0.13"
1515
tokio = { version = "1.14", features = ["full"] }
1616
anyhow = "1.0"
1717
near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }

examples/cross-contract-calls/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ anyhow = "1.0"
99
near-sdk = { path = "../../near-sdk", features = ["default", "unit-testing"] }
1010
test-case = "2.0"
1111
tokio = { version = "1.14", features = ["full"] }
12-
near-workspaces = "0.12"
12+
near-workspaces = "0.13"
1313

1414
cross-contract-high-level = { path = "./high-level" }
1515
cross-contract-low-level = { path = "./low-level" }

examples/factory-contract/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
anyhow = "1.0"
99
test-case = "2.0"
1010
tokio = { version = "1.14", features = ["full"] }
11-
near-workspaces = "0.12"
11+
near-workspaces = "0.13"
1212
near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
1313

1414
[profile.release]

examples/fungible-token/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
anyhow = "1.0"
99
near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
1010
tokio = { version = "1.14", features = ["full"] }
11-
near-workspaces = "0.12"
11+
near-workspaces = "0.13"
1212

1313
[profile.release]
1414
codegen-units = 1

examples/lockable-fungible-token/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ near-sdk = { path = "../../near-sdk", features = ["legacy"] }
1414
anyhow = "1.0"
1515
tokio = { version = "1.14", features = ["full"] }
1616
near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
17-
near-workspaces = "0.12"
17+
near-workspaces = "0.13"
1818

1919
[profile.release]
2020
codegen-units = 1

examples/non-fungible-token/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ anyhow = "1.0"
99
near-contract-standards = { path = "../../near-contract-standards" }
1010
near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
1111
tokio = { version = "1.14", features = ["full"] }
12-
near-workspaces = "0.12"
12+
near-workspaces = "0.13"
1313

1414
[profile.release]
1515
codegen-units = 1

near-contract-standards/src/non_fungible_token/core/core_impl.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,7 @@ impl NonFungibleTokenResolver for NonFungibleToken {
432432
// Get whether token should be returned
433433
let must_revert = match env::promise_result(0) {
434434
PromiseResult::Successful(value) => {
435-
if let Ok(yes_or_no) = near_sdk::serde_json::from_slice::<bool>(&value) {
436-
yes_or_no
437-
} else {
438-
true
439-
}
435+
near_sdk::serde_json::from_slice::<bool>(&value).unwrap_or(true)
440436
}
441437
PromiseResult::Failed => true,
442438
};

near-sdk/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ schemars = { version = "0.8.8", optional = true }
4242
near-abi = { version = "0.4.0", features = [
4343
"__chunked-entries",
4444
], optional = true }
45-
near-vm-runner = { version = "0.25", optional = true }
46-
near-primitives-core = { version = "0.25", optional = true }
47-
near-primitives = { version = "0.25", optional = true }
48-
near-crypto = { version = "0.25", default-features = false, optional = true }
49-
near-parameters = { version = "0.25", optional = true }
45+
near-vm-runner = { version = "0.26", optional = true }
46+
near-primitives-core = { version = "0.26", optional = true }
47+
near-primitives = { version = "0.26", optional = true }
48+
near-crypto = { version = "0.26", default-features = false, optional = true }
49+
near-parameters = { version = "0.26", optional = true }
5050

5151
[dev-dependencies]
5252
near-sdk = { path = ".", features = ["legacy", "unit-testing"] }
@@ -63,7 +63,7 @@ rand_chacha = "0.3.1"
6363
near-rng = "0.1.1"
6464
near-abi = { version = "0.4.0", features = ["__chunked-entries"] }
6565
symbolic-debuginfo = "12"
66-
near-workspaces = { version = "0.12", features = ["unstable"] }
66+
near-workspaces = { version = "0.13", features = ["unstable"] }
6767
anyhow = "1.0"
6868
tokio = { version = "1", features = ["full"] }
6969
strum = "0.25.0"

0 commit comments

Comments
 (0)