From 8de8167c64f06cc326d81360c5c0a846e07f487c Mon Sep 17 00:00:00 2001
From: PiVortex <owenhassall@hotmail.co.uk>
Date: Fri, 6 Sep 2024 13:01:06 +0100
Subject: [PATCH] fix: tests

---
 contract-advanced-rs/Cargo.toml                | 6 +++---
 contract-advanced-rs/src/batch_actions.rs      | 2 +-
 contract-advanced-rs/src/multiple_contracts.rs | 6 +++---
 contract-advanced-rs/src/similar_contracts.rs  | 6 +++---
 contract-advanced-rs/tests/tests.rs            | 6 +++---
 contract-simple-rs/Cargo.toml                  | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/contract-advanced-rs/Cargo.toml b/contract-advanced-rs/Cargo.toml
index 1955325..d67c76d 100644
--- a/contract-advanced-rs/Cargo.toml
+++ b/contract-advanced-rs/Cargo.toml
@@ -9,12 +9,12 @@ crate-type = ["cdylib", "rlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = "5.1.0"
+near-sdk = "5.4.0"
 schemars = "0.8.16"
 
 [dev-dependencies]
-near-sdk = { version = "5.0.0", features = ["unit-testing"] }
-near-workspaces = { version = "0.10.0", features = ["unstable"] }
+near-sdk = { version = "5.4.0", features = ["unit-testing"] }
+near-workspaces = { version = "0.11.0", features = ["unstable"] }
 tokio = { version = "1.12.0", features = ["full"] }
 serde_json = "1"
 
diff --git a/contract-advanced-rs/src/batch_actions.rs b/contract-advanced-rs/src/batch_actions.rs
index f57a0d2..7d6645c 100644
--- a/contract-advanced-rs/src/batch_actions.rs
+++ b/contract-advanced-rs/src/batch_actions.rs
@@ -26,7 +26,7 @@ impl Contract {
     ) -> String {
         // The callback only has access to the last action's result
         if let Ok(result) = last_result {
-            log!(format!("The last result is {result}"));
+            log!("The last result is {result}");
             result
         } else {
             log!("The batch call failed and all calls got reverted");
diff --git a/contract-advanced-rs/src/multiple_contracts.rs b/contract-advanced-rs/src/multiple_contracts.rs
index 0dd04c6..d452a46 100644
--- a/contract-advanced-rs/src/multiple_contracts.rs
+++ b/contract-advanced-rs/src/multiple_contracts.rs
@@ -63,7 +63,7 @@ impl Contract {
     ) -> (String, i8, Vec<PostedMessage>) {
         // The callback has access to the result of the 3 calls
         let greeting = if let Ok(result) = hello_result {
-            log!(format!("HelloNear says {result}"));
+            log!("HelloNear says {result}");
             result
         } else {
             log!("The call to HelloNear failed");
@@ -71,7 +71,7 @@ impl Contract {
         };
 
         let counter = if let Ok(result) = counter_result {
-            log!(format!("Counter is {result}"));
+            log!("Counter is {result}");
             result
         } else {
             log!("The call to Counter failed");
@@ -79,7 +79,7 @@ impl Contract {
         };
 
         let messages = if let Ok(result) = guestbook_result {
-            log!(format!("The messages are {result:?}"));
+            log!("The messages are {result:?}");
             result
         } else {
             log!("The call to GuestBook failed");
diff --git a/contract-advanced-rs/src/similar_contracts.rs b/contract-advanced-rs/src/similar_contracts.rs
index 9f1e401..62a92e3 100644
--- a/contract-advanced-rs/src/similar_contracts.rs
+++ b/contract-advanced-rs/src/similar_contracts.rs
@@ -39,15 +39,15 @@ impl Contract {
 
                 match result {
                     PromiseResult::Failed => {
-                        log!(format!("Promise number {index} failed."));
+                        log!("Promise number {index} failed.");
                         None
                     }
                     PromiseResult::Successful(value) => {
                         if let Ok(message) = near_sdk::serde_json::from_slice::<String>(&value) {
-                            log!(format!("Call {index} returned: {message}"));
+                            log!("Call {index} returned: {message}");
                             Some(message)
                         } else {
-                            log!(format!("Error deserializing call {index} result."));
+                            log!("Error deserializing call {index} result.");
                             None
                         }
                     }
diff --git a/contract-advanced-rs/tests/tests.rs b/contract-advanced-rs/tests/tests.rs
index ce95e1c..7a1e3c5 100644
--- a/contract-advanced-rs/tests/tests.rs
+++ b/contract-advanced-rs/tests/tests.rs
@@ -1,7 +1,7 @@
 use std::string::String;
 use serde_json::json;
 use near_workspaces::{types::NearToken, Account, Contract};
-use near_sdk::serde::{Deserialize, Serialize};
+use near_sdk::near;
  
 #[tokio::test]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -54,8 +54,8 @@ async fn test_multiple_contracts(
     guest_book_contract: &Contract,
     counter_contract: &Contract
 ) -> Result<(), Box<dyn std::error::Error>> {
-    #[derive(Deserialize, Serialize, Debug, PartialEq)]
-    #[serde(crate = "near_sdk::serde")]
+    #[derive(Debug, PartialEq)]
+    #[near(serializers = [json])]
     pub struct PostedMessage {
         pub premium: bool,
         pub sender: String,
diff --git a/contract-simple-rs/Cargo.toml b/contract-simple-rs/Cargo.toml
index 511c66a..b8e038e 100644
--- a/contract-simple-rs/Cargo.toml
+++ b/contract-simple-rs/Cargo.toml
@@ -9,11 +9,11 @@ crate-type = ["cdylib", "rlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = "5.1.0"
+near-sdk = "5.4.0"
 
 [dev-dependencies]
-near-sdk = { version = "5.0.0", features = ["unit-testing"] }
-near-workspaces = { version = "0.10.0", features = ["unstable"] }
+near-sdk = { version = "5.4.0", features = ["unit-testing"] }
+near-workspaces = { version = "0.11.0", features = ["unstable"] }
 tokio = { version = "1.12.0", features = ["full"] }
 serde_json = "1"