update sdk ot 5.3.0, fix errors and tests

Author: PiVortex

Cargo.toml

@@ -13,10 +13,10 @@ crate-type = ["cdylib", "rlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = { version = "5.1.0", features = ["unstable"] }
+near-sdk = { version = "5.3.0", features = ["unstable"] }
 
 [dev-dependencies]
-near-sdk = { version = "5.1.0", features = ["unit-testing"] }
+near-sdk = { version = "5.3.0", features = ["unit-testing"] }
 near-workspaces = { version = "0.10.0", features = ["unstable"] }
 tokio = { version = "1.12.0", features = ["full"] }
 serde_json = "1"

src/deploy.rs

@@ -74,13 +74,11 @@ impl Contract {
         #[callback_result] create_deploy_result: Result<(), PromiseError>,
     ) -> bool {
         if let Ok(_result) = create_deploy_result {
-            log!(format!("Correctly created and deployed to {account}"));
+            log!("Correctly created and deployed to {account}");
             return true;
         };
 
-        log!(format!(
-            "Error creating {account}, returning {attached}yⓃ to {user}"
-        ));
+        log!("Error creating {account}, returning {attached}yⓃ to {user}");
         Promise::new(user).transfer(attached);
         false
     }

tests/sandbox.rs

@@ -1,21 +1,19 @@
-use near_workspaces::types::{AccountId, KeyType, NearToken, SecretKey};
+use near_workspaces::types::{AccountId, NearToken};
 use serde_json::json;
 
+const TEN_NEAR: NearToken = NearToken::from_near(10);
+
 #[tokio::test]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let sandbox = near_workspaces::sandbox().await?;
-    let contract_wasm = near_workspaces::compile_project("./").await?;
-    let contract = sandbox.dev_deploy(&contract_wasm).await?;
+    let root = sandbox.root_account()?;
 
-    let alice = sandbox
-        .create_tla(
-            "alice.test.near".parse().unwrap(),
-            SecretKey::from_random(KeyType::ED25519),
-        )
-        .await?
-        .unwrap();
+    // Create accounts
+    let alice = create_subaccount(&root, "alice").await?;
+    let bob = create_subaccount(&root, "bob").await?;
 
-    let bob = sandbox.dev_create_account().await?;
+    let contract_wasm = near_workspaces::compile_project("./").await?;
+    let contract = sandbox.dev_deploy(&contract_wasm).await?;
 
     let res = contract
         .call("create_factory_subaccount_and_deploy")
@@ -50,3 +48,17 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
+
+async fn create_subaccount(
+    root: &near_workspaces::Account,
+    name: &str,
+) -> Result<near_workspaces::Account, Box<dyn std::error::Error>> {
+    let subaccount = root
+        .create_subaccount(name)
+        .initial_balance(TEN_NEAR)
+        .transact()
+        .await?
+        .unwrap();
+
+    Ok(subaccount)
+}