chore: Updated near-* dependendencies to v0.26.0. Migrated testing bl…

…ockchain mock to C-unwind (#1244)
near · Sep 11, 2024 · 9f5caac · 9f5caac
1 parent 9c68e71
commit 9f5caac
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 75 deletions.
diff --git a/examples/adder/Cargo.toml b/examples/adder/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 near-sdk = { path = "../../near-sdk" }
 
 [dev-dependencies]
-near-workspaces = "0.12"
+near-workspaces = "0.13"
 tokio = { version = "1.14", features = ["full"] }
 anyhow = "1.0"
 near-abi = "0.4.0"

diff --git a/examples/callback-results/Cargo.toml b/examples/callback-results/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 near-sdk = { path = "../../near-sdk" }
 
 [dev-dependencies]
-near-workspaces = "0.12"
+near-workspaces = "0.13"
 tokio = { version = "1.14", features = ["full"] }
 anyhow = "1.0"
 near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }

diff --git a/examples/cross-contract-calls/Cargo.toml b/examples/cross-contract-calls/Cargo.toml
@@ -9,7 +9,7 @@ anyhow = "1.0"
 near-sdk = { path = "../../near-sdk", features = ["default", "unit-testing"] }
 test-case = "2.0"
 tokio = { version = "1.14", features = ["full"] }
-near-workspaces = "0.12"
+near-workspaces = "0.13"
 
 cross-contract-high-level = { path = "./high-level" }
 cross-contract-low-level = { path = "./low-level" }

diff --git a/examples/factory-contract/Cargo.toml b/examples/factory-contract/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 anyhow = "1.0"
 test-case = "2.0"
 tokio = { version = "1.14", features = ["full"] }
-near-workspaces = "0.12"
+near-workspaces = "0.13"
 near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
 
 [profile.release]

diff --git a/examples/fungible-token/Cargo.toml b/examples/fungible-token/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 anyhow = "1.0"
 near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
 tokio = { version = "1.14", features = ["full"] }
-near-workspaces = "0.12"
+near-workspaces = "0.13"
 
 [profile.release]
 codegen-units = 1

diff --git a/examples/lockable-fungible-token/Cargo.toml b/examples/lockable-fungible-token/Cargo.toml
@@ -14,7 +14,7 @@ near-sdk = { path = "../../near-sdk", features = ["legacy"] }
 anyhow = "1.0"
 tokio = { version = "1.14", features = ["full"] }
 near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
-near-workspaces = "0.12"
+near-workspaces = "0.13"
 
 [profile.release]
 codegen-units = 1

diff --git a/examples/non-fungible-token/Cargo.toml b/examples/non-fungible-token/Cargo.toml
@@ -9,7 +9,7 @@ anyhow = "1.0"
 near-contract-standards = { path = "../../near-contract-standards" }
 near-sdk = { path = "../../near-sdk", features = ["unit-testing"] }
 tokio = { version = "1.14", features = ["full"] }
-near-workspaces = "0.12"
+near-workspaces = "0.13"
 
 [profile.release]
 codegen-units = 1

diff --git a/near-contract-standards/src/non_fungible_token/core/core_impl.rs b/near-contract-standards/src/non_fungible_token/core/core_impl.rs
@@ -432,11 +432,7 @@ impl NonFungibleTokenResolver for NonFungibleToken {
         // Get whether token should be returned
         let must_revert = match env::promise_result(0) {
             PromiseResult::Successful(value) => {
-                if let Ok(yes_or_no) = near_sdk::serde_json::from_slice::<bool>(&value) {
-                    yes_or_no
-                } else {
-                    true
-                }
+                near_sdk::serde_json::from_slice::<bool>(&value).unwrap_or(true)
             }
             PromiseResult::Failed => true,
         };

diff --git a/near-sdk/Cargo.toml b/near-sdk/Cargo.toml
@@ -42,11 +42,11 @@ schemars = { version = "0.8.8", optional = true }
 near-abi = { version = "0.4.0", features = [
     "__chunked-entries",
 ], optional = true }
-near-vm-runner = { version = "0.25", optional = true }
-near-primitives-core = { version = "0.25", optional = true }
-near-primitives = { version = "0.25", optional = true }
-near-crypto = { version = "0.25", default-features = false, optional = true }
-near-parameters = { version = "0.25", optional = true }
+near-vm-runner = { version = "0.26", optional = true }
+near-primitives-core = { version = "0.26", optional = true }
+near-primitives = { version = "0.26", optional = true }
+near-crypto = { version = "0.26", default-features = false, optional = true }
+near-parameters = { version = "0.26", optional = true }
 
 [dev-dependencies]
 near-sdk = { path = ".", features = ["legacy", "unit-testing"] }
@@ -63,7 +63,7 @@ rand_chacha = "0.3.1"
 near-rng = "0.1.1"
 near-abi = { version = "0.4.0", features = ["__chunked-entries"] }
 symbolic-debuginfo = "12"
-near-workspaces = { version = "0.12", features = ["unstable"] }
+near-workspaces = { version = "0.13", features = ["unstable"] }
 anyhow = "1.0"
 tokio = { version = "1", features = ["full"] }
 strum = "0.25.0"