chore: upgrade to [email protected]

near · Oct 12, 2023 · 677a18d · 677a18d
1 parent 1415b6e
commit 677a18d
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 48 deletions.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.69" # https://github.com/near/nearcore/issues/9143
+channel = "1.72"
diff --git a/workspaces-tests-utils/Cargo.toml b/workspaces-tests-utils/Cargo.toml
@@ -6,4 +6,4 @@ publish = false
 
 [target.'cfg(not(windows))'.dependencies]
 near-sdk.workspace = true
-workspaces = "0.7"
+near-workspaces = "0.8"
diff --git a/workspaces-tests-utils/src/lib.rs b/workspaces-tests-utils/src/lib.rs
@@ -2,7 +2,7 @@
 #![cfg(not(windows))]
 
 use near_sdk::{serde::de::DeserializeOwned, serde_json::json};
-use workspaces::{result::ExecutionFinalResult, Account, Contract};
+use near_workspaces::{result::ExecutionFinalResult, Account, Contract};
 
 pub async fn nft_token<T: DeserializeOwned>(contract: &Contract, token_id: &str) -> Option<T> {
     contract
@@ -21,7 +21,7 @@ pub struct Setup {
 
 /// Setup for individual tests
 pub async fn setup(wasm: &[u8], num_accounts: usize) -> Setup {
-    let worker = workspaces::sandbox().await.unwrap();
+    let worker = near_workspaces::sandbox().await.unwrap();
 
     // Initialize contract
     let contract = worker.dev_deploy(wasm).await.unwrap();

diff --git a/workspaces-tests/Cargo.toml b/workspaces-tests/Cargo.toml
@@ -71,5 +71,5 @@ near-crypto = "0.15.0"
 tokio = "1.21.1"
 
 [target.'cfg(not(windows))'.dev-dependencies]
-workspaces = "0.7"
+near-workspaces = "0.8"
 workspaces-tests-utils = { path = "../workspaces-tests-utils" }
diff --git a/workspaces-tests/tests/counter_multisig.rs b/workspaces-tests/tests/counter_multisig.rs
@@ -1,7 +1,7 @@
 #![cfg(not(windows))]
 
 use near_sdk::serde_json::json;
-use workspaces::{Account, Contract};
+use near_workspaces::{Account, Contract};
 
 const WASM: &[u8] =
     include_bytes!("../../target/wasm32-unknown-unknown/release/counter_multisig.wasm");
@@ -13,7 +13,7 @@ struct Setup {
 
 /// Setup for individual tests
 async fn setup(num_accounts: usize) -> Setup {
-    let worker = workspaces::sandbox().await.unwrap();
+    let worker = near_workspaces::sandbox().await.unwrap();
 
     // Initialize contract
     let contract = worker.dev_deploy(WASM).await.unwrap();

diff --git a/workspaces-tests/tests/escrow.rs b/workspaces-tests/tests/escrow.rs
@@ -4,8 +4,8 @@ use near_sdk::{
     serde::{Deserialize, Serialize},
     serde_json::{self, json},
 };
+use near_workspaces::{Account, AccountId, Contract};
 use tokio::join;
-use workspaces::{Account, AccountId, Contract};
 
 const WASM: &[u8] = include_bytes!("../../target/wasm32-unknown-unknown/release/escrow.wasm");
 
@@ -36,7 +36,7 @@ struct Setup {
 
 /// Setup for individual tests
 async fn setup(num_accounts: usize, wasm: &[u8]) -> Setup {
-    let worker = workspaces::sandbox().await.unwrap();
+    let worker = near_workspaces::sandbox().await.unwrap();
 
     // Initialize user accounts
     let mut accounts = vec![];

diff --git a/workspaces-tests/tests/fungible_token.rs b/workspaces-tests/tests/fungible_token.rs
@@ -1,7 +1,7 @@
 #![cfg(not(windows))]
 
 use near_sdk::{json_types::U128, serde_json::json};
-use workspaces::{Account, AccountId, Contract};
+use near_workspaces::{Account, AccountId, Contract};
 
 const WASM: &[u8] =
     include_bytes!("../../target/wasm32-unknown-unknown/release/fungible_token.wasm");
@@ -24,7 +24,7 @@ struct Setup {
 
 /// Setup for individual tests
 async fn setup(num_accounts: usize) -> Setup {
-    let worker = workspaces::sandbox().await.unwrap();
+    let worker = near_workspaces::sandbox().await.unwrap();
 
     // Initialize contract
     let contract = worker.dev_deploy(WASM).await.unwrap();

diff --git a/workspaces-tests/tests/native_multisig.rs b/workspaces-tests/tests/native_multisig.rs
@@ -5,13 +5,13 @@ use std::{future::IntoFuture, time::Duration};
 use near_crypto::{KeyType, SecretKey};
 use near_sdk::{serde_json::json, Gas, ONE_NEAR};
 use near_sdk_contract_tools::approval::native_transaction_action::PromiseAction;
-use tokio::{join, task::JoinSet, time::sleep};
-use workspaces::{
+use near_workspaces::{
     result::{ExecutionResult, Value},
     sandbox,
     types::{AccessKeyPermission, Finality},
-    Account, Contract, DevNetwork, Worker,
+    Account, AccountDetailsPatch, Contract, DevNetwork, Worker,
 };
+use tokio::{join, time::sleep};
 
 const WASM: &[u8] =
     include_bytes!("../../target/wasm32-unknown-unknown/release/native_multisig.wasm");
@@ -106,23 +106,12 @@ async fn stake() {
 
     const MINIMUM_STAKE: u128 = 800_000_000_000_000_000_000_000_000;
 
-    let mut set = JoinSet::new();
-
-    // Fund contract account to meet minumum stake requirement.
-    // At the time of writing, it looks like workspaces network configuration is not yet released:
-    // https://github.com/near/workspaces-rs/commit/8df17e5d6ebbfe9ced52beb133f3e5b07a86dffb
-    // Otherwise we could just decrease the staking requirement.
-    for _ in 0..10 {
-        let w = worker.clone();
-        let contract_id = contract.id().clone();
-        set.spawn(async move {
-            let a = w.dev_create_account().await.unwrap();
-            a.delete_account(&contract_id).await.unwrap().unwrap();
-        });
-    }
-
-    // Await all
-    while set.join_next().await.is_some() {}
+    worker
+        .patch(contract.id())
+        .account(AccountDetailsPatch::default().balance(MINIMUM_STAKE * 4))
+        .transact()
+        .await
+        .unwrap();
 
     let alice = &accounts[0];
     let bob = &accounts[1];
@@ -136,7 +125,7 @@ async fn stake() {
         "Account should start with no staked tokens"
     );
 
-    let stake_amount = MINIMUM_STAKE;
+    let stake_amount = MINIMUM_STAKE * 2;
 
     let request_id = alice
         .call(contract.id(), "request")
@@ -235,7 +224,7 @@ async fn create_account_transfer_deploy_contract_function_call() {
     let bob = &accounts[1];
 
     let new_account_id_str = format!("new.{}", contract.id());
-    let new_account_id: workspaces::AccountId = new_account_id_str.parse().unwrap();
+    let new_account_id: near_workspaces::AccountId = new_account_id_str.parse().unwrap();
 
     // Account does not exist yet
     assert!(worker.view_account(&new_account_id).await.is_err());

diff --git a/workspaces-tests/tests/non_fungible_token.rs b/workspaces-tests/tests/non_fungible_token.rs
@@ -9,8 +9,8 @@ use near_sdk_contract_tools::standard::{
     nep178,
     nep297::Event,
 };
+use near_workspaces::{operations::Function, types::Gas};
 use tokio::task::JoinSet;
-use workspaces::operations::Function;
 use workspaces_tests_utils::{expect_execution_error, nft_token, setup, Setup};
 
 const WASM_171_ONLY: &[u8] =
@@ -22,6 +22,8 @@ const WASM_FULL: &[u8] =
 const RECEIVER_WASM: &[u8] =
     include_bytes!("../../target/wasm32-unknown-unknown/release/non_fungible_token_receiver.wasm");
 
+const THIRTY_TERAGAS: Gas = Gas::from_gas(30_000_000_000_000);
+
 fn token_meta(id: String) -> near_sdk::serde_json::Value {
     near_sdk::serde_json::to_value(TokenMetadata {
         title: Some(id),
@@ -508,7 +510,7 @@ async fn transfer_call_success() {
             "receiver_id": bob.id(),
             "msg": "",
         }))
-        .gas(30_000_000_000_000)
+        .gas(THIRTY_TERAGAS)
         .deposit(1)
         .transact()
         .await
@@ -567,7 +569,7 @@ async fn transfer_call_return_success() {
             "receiver_id": bob.id(),
             "msg": "return",
         }))
-        .gas(30_000_000_000_000)
+        .gas(THIRTY_TERAGAS)
         .deposit(1)
         .transact()
         .await
@@ -636,7 +638,7 @@ async fn transfer_call_receiver_panic() {
             "receiver_id": bob.id(),
             "msg": "panic",
         }))
-        .gas(30_000_000_000_000)
+        .gas(THIRTY_TERAGAS)
         .deposit(1)
         .transact()
         .await
@@ -706,7 +708,7 @@ async fn transfer_call_receiver_send_return() {
             "receiver_id": bob.id(),
             "msg": format!("transfer:{}", charlie.id()),
         }))
-        .gas(300_000_000_000_000) // xtra gas
+        .gas(THIRTY_TERAGAS) // xtra gas
         .deposit(1)
         .transact()
         .await

diff --git a/workspaces-tests/tests/rbac.rs b/workspaces-tests/tests/rbac.rs
@@ -6,8 +6,8 @@ use near_sdk::{
     serde::Deserialize,
     serde_json::{self, json},
 };
+use near_workspaces::{Account, AccountId, Contract};
 use tokio::join;
-use workspaces::{Account, AccountId, Contract};
 
 const WASM: &[u8] = include_bytes!("../../target/wasm32-unknown-unknown/release/rbac.wasm");
 
@@ -27,7 +27,7 @@ struct Setup {
 
 /// Setup for individual tests
 async fn setup(num_accounts: usize, wasm: &[u8]) -> Setup {
-    let worker = workspaces::sandbox().await.unwrap();
+    let worker = near_workspaces::sandbox().await.unwrap();
 
     // Initialize user accounts
     let mut accounts = vec![];

diff --git a/workspaces-tests/tests/simple_multisig.rs b/workspaces-tests/tests/simple_multisig.rs
@@ -1,7 +1,7 @@
 #![cfg(not(windows))]
 
 use near_sdk::serde_json::json;
-use workspaces::{Account, Contract};
+use near_workspaces::{Account, Contract};
 
 const WASM: &[u8] =
     include_bytes!("../../target/wasm32-unknown-unknown/release/simple_multisig.wasm");
@@ -13,7 +13,7 @@ struct Setup {
 
 /// Setup for individual tests
 async fn setup(num_accounts: usize) -> Setup {
-    let worker = workspaces::sandbox().await.unwrap();
+    let worker = near_workspaces::sandbox().await.unwrap();
 
     // Initialize contract
     let contract = worker.dev_deploy(WASM).await.unwrap();

diff --git a/workspaces-tests/tests/storage_fee.rs b/workspaces-tests/tests/storage_fee.rs
@@ -2,7 +2,7 @@
 
 use near_sdk::{json_types::U128, serde_json::json, ONE_NEAR};
 
-use workspaces::{sandbox, Account, Contract, DevNetwork, Worker};
+use near_workspaces::{sandbox, Account, Contract, DevNetwork, Worker};
 
 const WASM: &[u8] = include_bytes!("../../target/wasm32-unknown-unknown/release/storage_fee.wasm");
 
@@ -73,7 +73,8 @@ async fn storage_fee() {
 
         // How much was actually charged to the account?
         // Note that there will be *some* overhead, e.g. collection indexing
-        let net_fee = balance_before - balance_after - (r.total_gas_burnt as u128 * gas_price);
+        let net_fee =
+            balance_before - balance_after - (r.total_gas_burnt.as_gas() as u128 * gas_price);
 
         assert!(net_fee >= minimum_storage_fee);
         assert!(net_fee - minimum_storage_fee < byte_cost * 100); // Sanity/validity check / allow up to 100 bytes worth of additional storage to be charged

diff --git a/workspaces-tests/tests/upgrade.rs b/workspaces-tests/tests/upgrade.rs
@@ -4,7 +4,7 @@ use near_sdk::{
     borsh::{self, BorshSerialize},
     serde::Serialize,
 };
-use workspaces::{Account, Contract};
+use near_workspaces::{Account, Contract};
 
 const WASM_BORSH: &[u8] =
     include_bytes!("../../target/wasm32-unknown-unknown/release/upgrade_old_borsh.wasm");
@@ -42,7 +42,7 @@ struct Setup {
 
 /// Setup for individual tests
 async fn setup(num_accounts: usize, wasm: &[u8]) -> Setup {
-    let worker = workspaces::sandbox().await.unwrap();
+    let worker = near_workspaces::sandbox().await.unwrap();
 
     // Initialize user accounts
     let mut accounts = vec![];

diff --git a/workspaces-tests/tests/upgrade_multisig.rs b/workspaces-tests/tests/upgrade_multisig.rs
@@ -1,7 +1,7 @@
 #![cfg(not(windows))]
 
 use near_sdk::{json_types::Base64VecU8, serde_json::json};
-use workspaces::{Account, Contract};
+use near_workspaces::{Account, Contract};
 
 const WASM: &[u8] =
     include_bytes!("../../target/wasm32-unknown-unknown/release/upgrade_old_multisig.wasm");
@@ -16,7 +16,7 @@ struct Setup {
 
 /// Setup for individual tests
 async fn setup(num_accounts: usize, wasm: &[u8]) -> Setup {
-    let worker = workspaces::testnet().await.unwrap();
+    let worker = near_workspaces::sandbox().await.unwrap();
 
     // Initialize user accounts
     let mut accounts = vec![];