diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index c4b91c29..13a280f9 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -6,6 +6,7 @@ publish = false [dev-dependencies] anyhow = "1.0" +borsh = "0.9" cargo-near = { path = "../cargo-near" } function_name = "0.3" git2 = "0.14" diff --git a/integration-tests/templates/sdk-dependency/_Cargo_patch.toml b/integration-tests/templates/sdk-dependency/_Cargo_patch.toml index dfec4b76..05152596 100644 --- a/integration-tests/templates/sdk-dependency/_Cargo_patch.toml +++ b/integration-tests/templates/sdk-dependency/_Cargo_patch.toml @@ -12,7 +12,7 @@ serde = { version = "1", features = ["derive"] } schemars = "0.8" [patch.crates-io] -near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "2b3a8a0a68208c5cf3fa88fd566daa107f782e26" } +near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "49d521c01033757b01bacf40d8713fe738bbe1cf" } [workspace] members = [] diff --git a/integration-tests/tests/cargo/mod.rs b/integration-tests/tests/cargo/mod.rs index 8eea4e84..4c9607a6 100644 --- a/integration-tests/tests/cargo/mod.rs +++ b/integration-tests/tests/cargo/mod.rs @@ -19,7 +19,7 @@ fn clone_git_repo(version: &str) -> anyhow::Result { #[test] #[named] fn test_dependency_local_path() -> anyhow::Result<()> { - let near_sdk_dir = clone_git_repo("2b3a8a0a68208c5cf3fa88fd566daa107f782e26")?; + let near_sdk_dir = clone_git_repo("49d521c01033757b01bacf40d8713fe738bbe1cf")?; let near_sdk_dep_path = near_sdk_dir.path().join("near-sdk"); // near-sdk = { path = "::path::", features = ["abi"] } @@ -40,7 +40,7 @@ fn test_dependency_local_path() -> anyhow::Result<()> { #[test] #[named] fn test_dependency_local_path_with_version() -> anyhow::Result<()> { - let near_sdk_dir = clone_git_repo("2b3a8a0a68208c5cf3fa88fd566daa107f782e26")?; + let near_sdk_dir = clone_git_repo("49d521c01033757b01bacf40d8713fe738bbe1cf")?; let near_sdk_dep_path = near_sdk_dir.path().join("near-sdk"); // near-sdk = { path = "::path::", version = "4.1.0-pre.1", features = ["abi"] } @@ -172,7 +172,7 @@ fn test_dependency_patch() -> anyhow::Result<()> { // near-sdk = { version = "4.1.0-pre.1", features = ["abi"] } // // [patch.crates-io] - // near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "2b3a8a0a68208c5cf3fa88fd566daa107f782e26" } + // near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "49d521c01033757b01bacf40d8713fe738bbe1cf" } let abi_root = generate_abi_fn! { with Cargo "/templates/sdk-dependency/_Cargo_patch.toml"; diff --git a/integration-tests/tests/tests/borsh_schema.rs b/integration-tests/tests/tests/borsh_schema.rs index 4f74b413..9941c79e 100644 --- a/integration-tests/tests/tests/borsh_schema.rs +++ b/integration-tests/tests/tests/borsh_schema.rs @@ -1,9 +1,7 @@ +use borsh::schema::{BorshSchemaContainer, Definition, Fields}; use cargo_near_integration_tests::{generate_abi, generate_abi_fn}; use function_name::named; -use near_sdk::{ - __private::{AbiParameter, AbiType}, - borsh::schema::{BorshSchemaContainer, Definition, Fields}, -}; +use near_abi::{AbiParameter, AbiType}; use std::{collections::HashMap, fs}; trait AsBorshSchema {