fix kv_exists usage and add testing

Signed-off-by: Valentyn Faychuk <[email protected]>

Author: valentynfaychuk

contract_samples/rust/README.md

@@ -27,7 +27,14 @@ cargo install amadeus-cli
 To build the wasm smart contracts, simply run the `./build_and_validate.sh`.
 The artifacts will be placed in `target/wasm32-unknown-unknown/release/examples`.
 
-### Testing
+## Unit Testing
+
+```bash
+cargo +nightly test --example showcase --features testing --no-default-features -- --nocapture --test-threads=1
+cargo expand -p amadeus-sdk --example showcase --target wasm32-unknown-unknown
+```
+
+### Testnet Deployment
 
 Make sure you have `amadeus-cli` installed.
 Follow the code snippet below to run each example on the testnet.
@@ -72,4 +79,15 @@ ama tx --sk wallet.sk $NFT_PK init '[]' --url https://testnet-rpc.ama.one
 ama tx --sk wallet.sk $NFT_PK claim '[]' --url https://testnet-rpc.ama.one
 ama tx --sk wallet.sk $NFT_PK view_nft '["AGENTIC", "1"]' --url https://testnet-rpc.ama.one
 ama tx --sk wallet.sk $NFT_PK claim '[]' --url https://testnet-rpc.ama.one
+
+ama gen-sk showcase.sk
+export SHOWCASE_PK=$(ama get-pk --sk showcase.sk)
+ama tx --sk wallet.sk Coin transfer '[{"b58": "'$SHOWCASE_PK'"}, "2000000000", "AMA"]' --url https://testnet-rpc.ama.one
+ama deploy-tx --sk showcase.sk showcase.wasm --url https://testnet-rpc.ama.one
+ama tx --sk wallet.sk $SHOWCASE_PK increment_total_matches '[]' --url https://testnet-rpc.ama.one
+ama tx --sk wallet.sk $SHOWCASE_PK set_tournament_info '["World Cup", "1000000"]' --url https://testnet-rpc.ama.one
+ama tx --sk wallet.sk $SHOWCASE_PK record_win '["alice"]' --url https://testnet-rpc.ama.one
+ama tx --sk wallet.sk $SHOWCASE_PK record_win '["alice"]' --url https://testnet-rpc.ama.one
+ama tx --sk wallet.sk $SHOWCASE_PK get_player_wins '["alice"]' --url https://testnet-rpc.ama.one
+ama tx --sk wallet.sk $SHOWCASE_PK get_tournament_name '[]' --url https://testnet-rpc.ama.one
 ```

contract_samples/rust/examples/showcase.rs

@@ -1,8 +1,12 @@
-#![no_std]
-#![no_main]
+#![cfg_attr(not(any(test, feature = "testing")), no_std)]
+#![cfg_attr(not(any(test, feature = "testing")), no_main)]
+#![cfg_attr(any(test, feature = "testing"), feature(thread_local))]
 
 extern crate alloc;
-use alloc::vec::Vec;
+
+#[cfg(any(test, feature = "testing"))]
+extern crate std;
+
 use alloc::string::{String, ToString};
 use amadeus_sdk::*;
 
@@ -36,8 +40,8 @@ impl Leaderboard {
         *self.total_matches += 1;
     }
 
-    pub fn get_total_matches(&self) -> Vec<u8> {
-        (*self.total_matches).to_string().into_bytes()
+    pub fn get_total_matches(&self) -> i32 {
+        *self.total_matches
     }
 
     pub fn record_match(&mut self, player: String, match_id: u64, score: u16, opponent: String) {
@@ -50,13 +54,13 @@ impl Leaderboard {
         *self.total_matches += 1;
     }
 
-    pub fn get_match_score(&self, player: String, match_id: u64) -> Vec<u8> {
+    pub fn get_match_score(&self, player: String, match_id: u64) -> u16 {
         if let Some(matches) = self.players.get(player) {
             if let Some(m) = matches.get(match_id) {
-                return (*m.score).to_string().into_bytes();
+                return *m.score;
             }
         }
-        "0".to_string().into_bytes()
+        0
     }
 
     pub fn get_match_opponent(&self, player: String, match_id: u64) -> String {
@@ -77,8 +81,8 @@ impl Leaderboard {
         (*self.tournament.name).clone()
     }
 
-    pub fn get_tournament_prize(&self) -> Vec<u8> {
-        (*self.tournament.prize_pool).to_string().into_bytes()
+    pub fn get_tournament_prize(&self) -> u64 {
+        *self.tournament.prize_pool
     }
 
     pub fn record_win(&mut self, player: String) {
@@ -89,15 +93,98 @@ impl Leaderboard {
         }
     }
 
-    pub fn get_player_wins(&self, player: String) -> Vec<u8> {
+    pub fn get_player_wins(&self, player: String) -> u32 {
         if let Some(wins) = self.player_wins.get(&player) {
-            (*wins).to_string().into_bytes()
+            **wins
         } else {
-            "0".to_string().into_bytes()
+            0
         }
     }
 
     pub fn set_player_wins(&mut self, player: String, wins: u32) {
         self.player_wins.insert(player, wins);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use amadeus_sdk::testing::*;
+
+    #[test]
+    fn test_increment_total_matches() {
+        reset();
+        let mut state = Leaderboard::with_prefix(Vec::new());
+        state.increment_total_matches();
+        state.flush();
+        println!("\n{}\n", dump());
+        let state2 = Leaderboard::with_prefix(Vec::new());
+        assert_eq!(state2.get_total_matches(), 1);
+    }
+
+    #[test]
+    fn test_set_tournament_info() {
+        reset();
+        let mut state = Leaderboard::with_prefix(Vec::new());
+        state.set_tournament_info("World Cup".to_string(), 1000000);
+        state.flush();
+        println!("\n{}\n", dump());
+        let state2 = Leaderboard::with_prefix(Vec::new());
+        assert_eq!(state2.get_tournament_name(), "World Cup");
+        assert_eq!(state2.get_tournament_prize(), 1000000);
+    }
+
+    #[test]
+    fn test_record_win() {
+        reset();
+        let mut state = Leaderboard::with_prefix(Vec::new());
+        state.record_win("alice".to_string());
+        state.flush();
+        println!("\n{}\n", dump());
+        let state2 = Leaderboard::with_prefix(Vec::new());
+        assert_eq!(state2.get_player_wins("alice".to_string()), 1);
+    }
+
+    #[test]
+    fn test_multiple_operations() {
+        reset();
+
+        let mut state = Leaderboard::with_prefix(Vec::new());
+        state.increment_total_matches();
+        state.flush();
+        println!("After increment_total_matches():\n{}\n", dump());
+
+        let mut state = Leaderboard::with_prefix(Vec::new());
+        state.set_tournament_info("World Cup".to_string(), 1000000);
+        state.flush();
+        println!("After set_tournament_info():\n{}\n", dump());
+
+        let mut state = Leaderboard::with_prefix(Vec::new());
+        state.record_win("alice".to_string());
+        state.flush();
+        println!("After record_win(alice):\n{}\n", dump());
+
+        let mut state = Leaderboard::with_prefix(Vec::new());
+        state.record_win("alice".to_string());
+        state.flush();
+        println!("After record_win(alice) 2nd:\n{}\n", dump());
+
+        let mut state = Leaderboard::with_prefix(Vec::new());
+        state.record_win("bob".to_string());
+        state.flush();
+        println!("After record_win(bob):\n{}\n", dump());
+
+        let mut state = Leaderboard::with_prefix(Vec::new());
+        state.set_player_wins("charlie".to_string(), 5);
+        state.flush();
+        println!("After set_player_wins(charlie, 5):\n{}\n", dump());
+
+        let state = Leaderboard::with_prefix(Vec::new());
+        assert_eq!(state.get_total_matches(), 1);
+        assert_eq!(state.get_player_wins("alice".to_string()), 2);
+        assert_eq!(state.get_player_wins("bob".to_string()), 1);
+        assert_eq!(state.get_player_wins("charlie".to_string()), 5);
+        assert_eq!(state.get_tournament_name(), "World Cup");
+        assert_eq!(state.get_tournament_prize(), 1000000);
+    }
+}

contract_samples/rust/sdk-macros/src/lib.rs

@@ -173,13 +173,27 @@ fn handle_impl_block(impl_block: ItemImpl) -> TokenStream {
             quote!(#name(#(#call_args),*))
         };
 
+        let return_wrapper = if has_return {
+            if let syn::ReturnType::Type(_, ret_type) = &method.sig.output {
+                if is_integer_type(ret_type) {
+                    quote! { ret(result.to_string().into_bytes()); }
+                } else {
+                    quote! { ret(result); }
+                }
+            } else {
+                quote! { ret(result); }
+            }
+        } else {
+            quote! {}
+        };
+
         let body = if has_return {
             quote! {
                 #(#deserializations)*
                 let mut state = <#self_ty as ContractState>::with_prefix(alloc::vec::Vec::new());
                 let result = state.#call;
                 state.flush();
-                ret(result);
+                #return_wrapper
             }
         } else {
             quote! {

contract_samples/rust/sdk/Cargo.toml

@@ -11,8 +11,13 @@ repository = "https://github.com/amadeusprotocol/node"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-dlmalloc = { version = "0.2", features = ["global"] }
 amadeus-sdk-macros = { path = "../sdk-macros" }
+dlmalloc = { version = "0.2", features = ["global"], optional = true }
+
+[features]
+default = ["use-dlmalloc"]
+use-dlmalloc = ["dlmalloc"]
+testing = []
 
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = false