chore: revert importing borsh in near-contract-standards and `exa…

…mples`
near · Sep 5, 2023 · 42759d9 · 42759d9
1 parent 9ed89a8
commit 42759d9
Show file tree

Hide file tree

Showing 60 changed files with 121 additions and 102 deletions.
diff --git a/ci-test.sh b/ci-test.sh
@@ -11,7 +11,7 @@ else
  cargo generate-lockfile
 
  ### this is section for packages, refusing to work with 1.69
- cargo update -p clap@4.4.1 --precise 4.3.24
+ cargo update -p clap@4.4.2 --precise 4.3.24
  cargo update -p clap_lex@0.5.1 --precise 0.5.0
  ### end of 1.69 threshold section
 

diff --git a/examples/adder/Cargo.lock b/examples/adder/Cargo.lock
diff --git a/examples/adder/Cargo.toml b/examples/adder/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
 [dependencies]
 near-sdk = { path = "../../near-sdk", features = ["unstable"] }
 serde = { version = "1", features = ["derive"] }
-borsh = { version = "1.0.0-alpha.4", features = ["derive"] }
 schemars = "0.8"
 
 [dev-dependencies]

diff --git a/examples/adder/src/lib.rs b/examples/adder/src/lib.rs
@@ -3,6 +3,7 @@ use near_sdk::serde::{Deserialize, Serialize};
 use near_sdk::{near_bindgen, NearSchema};
 
 #[derive(NearSchema, Serialize, Deserialize, BorshDeserialize, BorshSerialize)]
+#[borsh(crate = "::near_sdk::borsh")]
 #[abi(json, borsh)]
 pub struct Pair(u32, u32);
 
@@ -15,6 +16,7 @@ pub struct DoublePair {
 
 #[near_bindgen]
 #[derive(Default, BorshDeserialize, BorshSerialize)]
+#[borsh(crate = "::near_sdk::borsh")]
 pub struct Adder {}
 
 #[near_bindgen]

diff --git a/examples/callback-results/Cargo.lock b/examples/callback-results/Cargo.lock
diff --git a/examples/cross-contract-calls/Cargo.lock b/examples/cross-contract-calls/Cargo.lock
diff --git a/examples/cross-contract-calls/high-level/Cargo.toml b/examples/cross-contract-calls/high-level/Cargo.toml
@@ -9,4 +9,3 @@ crate-type = ["cdylib"]
 
 [dependencies]
 near-sdk = { path = "../../../near-sdk" }
-borsh = { version = "1.0.0-alpha.4", features = ["derive"] }
diff --git a/examples/cross-contract-calls/high-level/src/lib.rs b/examples/cross-contract-calls/high-level/src/lib.rs
@@ -4,6 +4,7 @@ use near_sdk::{log, near_bindgen, PromiseOrValue};
 
 #[near_bindgen]
 #[derive(Default, BorshDeserialize, BorshSerialize)]
+#[borsh(crate = "::near_sdk::borsh")]
 pub struct CrossContract {}
 
 #[near_bindgen]

diff --git a/examples/cross-contract-calls/low-level/Cargo.toml b/examples/cross-contract-calls/low-level/Cargo.toml
@@ -9,4 +9,3 @@ crate-type = ["cdylib"]
 
 [dependencies]
 near-sdk = { path = "../../../near-sdk" }
-borsh = { version = "1.0.0-alpha.4", features = ["derive"] }
diff --git a/examples/cross-contract-calls/low-level/src/lib.rs b/examples/cross-contract-calls/low-level/src/lib.rs
@@ -10,6 +10,7 @@ const FACTORIAL_MULT_CALL_GAS: Gas = Gas(10_000_000_000_000);
 
 #[near_bindgen]
 #[derive(Default, BorshDeserialize, BorshSerialize)]
+#[borsh(crate = "::near_sdk::borsh")]
 pub struct CrossContract {}
 
 #[near_bindgen]

diff --git a/examples/factory-contract/Cargo.lock b/examples/factory-contract/Cargo.lock
diff --git a/examples/factory-contract/high-level/Cargo.toml b/examples/factory-contract/high-level/Cargo.toml
@@ -9,4 +9,3 @@ crate-type = ["cdylib"]
 
 [dependencies]
 near-sdk = { path = "../../../near-sdk" }
-borsh = { version = "1.0.0-alpha.4", features = ["derive"] }
diff --git a/examples/factory-contract/high-level/src/lib.rs b/examples/factory-contract/high-level/src/lib.rs
@@ -4,6 +4,7 @@ use near_sdk::{env, ext_contract, json_types::U128, near_bindgen, AccountId, Pro
 
 #[near_bindgen]
 #[derive(Default, BorshDeserialize, BorshSerialize)]
+#[borsh(crate = "::near_sdk::borsh")]
 pub struct FactoryContract {}
 
 // If the `ext_contract` name is not provided explicitly, the namespace for generated methods is

diff --git a/examples/factory-contract/low-level/Cargo.toml b/examples/factory-contract/low-level/Cargo.toml
@@ -9,4 +9,3 @@ crate-type = ["cdylib"]
 
 [dependencies]
 near-sdk = { path = "../../../near-sdk" }
-borsh = { version = "1.0.0-alpha.4", features = ["derive"] }
diff --git a/examples/factory-contract/low-level/src/lib.rs b/examples/factory-contract/low-level/src/lib.rs
@@ -8,6 +8,7 @@ const SINGLE_CALL_GAS: Gas = Gas(20_000_000_000_000);
 
 #[near_bindgen]
 #[derive(Default, BorshDeserialize, BorshSerialize)]
+#[borsh(crate = "::near_sdk::borsh")]
 pub struct FactoryContract {}
 
 #[near_bindgen]

diff --git a/examples/fungible-token/Cargo.lock b/examples/fungible-token/Cargo.lock
diff --git a/examples/fungible-token/ft/Cargo.toml b/examples/fungible-token/ft/Cargo.toml
@@ -9,6 +9,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 near-sdk = { path = "../../../near-sdk" }
-borsh = { version = "1.0.0-alpha.4", features = ["derive"] }
 near-contract-standards = { path = "../../../near-contract-standards" }
 schemars = "0.8"