changed branch to testnet (#3)

gear-foundation · Feb 24, 2023 · b529d11 · b529d11
1 parent d0e45fc
commit b529d11
Show file tree

Hide file tree

Showing 9 changed files with 280 additions and 1,363 deletions.
diff --git a/contracts/tamagotchi-battle/contracts/Cargo.lock b/contracts/tamagotchi-battle/contracts/Cargo.lock
diff --git a/contracts/tamagotchi-battle/contracts/battle/.binpath b/contracts/tamagotchi-battle/contracts/battle/.binpath
@@ -1 +1 @@
-../target/wasm32-unknown-unknown/release/battle
+../target/wasm32-unknown-unknown/release/battle
diff --git a/contracts/tamagotchi-battle/contracts/battle/Cargo.toml b/contracts/tamagotchi-battle/contracts/battle/Cargo.toml
@@ -4,20 +4,20 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-gstd = { git = "https://github.com/gear-tech/gear.git",features = ["debug"], branch = "stable" }
+gstd = { git = "https://github.com/gear-tech/gear.git",features = ["debug"], branch = "testnet" }
 codec = { package = "parity-scale-codec", version = "3.2.1", default-features = false }
 battle-io = { path = "io" }
 tmg-io = { path = "../tamagotchi/io" }
 scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
 hex-literal = "0.3.4"
 
 [build-dependencies]
-gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git"}
+gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git", branch = "testnet"}
 battle-io = { path = "io" }
 
 [dev-dependencies]
-gtest = { git = "https://github.com/gear-tech/gear.git", branch = "stable"}
-gclient = { git = "https://github.com/gear-tech/gear.git", branch = "stable" }
+gtest = { git = "https://github.com/gear-tech/gear.git", branch = "testnet"}
+gclient = { git = "https://github.com/gear-tech/gear.git", branch = "testnet" }
 tokio = "1"
 hex = "0.4"
 battle-state = { path = "state" }
diff --git a/contracts/tamagotchi-battle/contracts/battle/io/Cargo.toml b/contracts/tamagotchi-battle/contracts/battle/io/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-gstd = { git = "https://github.com/gear-tech/gear.git", features = ["debug"] , branch = "stable"}
+gstd = { git = "https://github.com/gear-tech/gear.git", features = ["debug"], branch = "testnet"}
 codec = { package = "parity-scale-codec", version = "3.2.1", default-features = false }
-gmeta = {  git = "https://github.com/gear-tech/gear.git" }
+gmeta = {  git = "https://github.com/gear-tech/gear.git", branch = "testnet" }
 scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
diff --git a/contracts/tamagotchi-battle/contracts/battle/state/Cargo.toml b/contracts/tamagotchi-battle/contracts/battle/state/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.2.0"
 edition = "2021"
 
 [dependencies]
-gstd = { git = "https://github.com/gear-tech/gear.git", branch = "stable" }
-gmeta = { git = "https://github.com/gear-tech/gear.git", branch = "stable", features = ["codegen"] }
+gstd = { git = "https://github.com/gear-tech/gear.git", branch = "testnet" }
+gmeta = { git = "https://github.com/gear-tech/gear.git", branch = "testnet", features = ["codegen"] }
 battle-io = { path = "../io" }
 
 [build-dependencies]
-gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git", branch = "stable", features = ["metawasm"] }
+gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git", branch = "testnet", features = ["metawasm"] }
diff --git a/contracts/tamagotchi-battle/contracts/battle/state/src/lib.rs b/contracts/tamagotchi-battle/contracts/battle/state/src/lib.rs
@@ -4,18 +4,18 @@ use gmeta::metawasm;
 use gstd::{prelude::*, ActorId};
 
 #[metawasm]
-pub trait Metawasm {
-    type State = Battle;
+pub mod metafns {
+    pub type State = Battle;
 
-    fn player(tmg_id: ActorId, state: Self::State) -> Player {
+    pub fn player(state: State, tmg_id: ActorId) -> Player {
         state
             .players
             .get(&tmg_id)
             .unwrap_or(&Default::default())
             .clone()
     }
 
-    fn power_and_health(tmg_id: ActorId, state: Self::State) -> (u16, u16) {
+    pub fn power_and_health(state: State, tmg_id: ActorId) -> (u16, u16) {
         let player = state
             .players
             .get(&tmg_id)
@@ -24,11 +24,11 @@ pub trait Metawasm {
         (player.power, player.health)
     }
 
-    fn round(state: Self::State) -> Round {
+    pub fn round(state: State) -> Round {
         state.round
     }
 
-    fn battle_state(state: Self::State) -> BattleState {
+    pub fn battle_state(state: State) -> BattleState {
         state.state
     }
 }
diff --git a/contracts/tamagotchi-battle/contracts/tamagotchi/.binpath b/contracts/tamagotchi-battle/contracts/tamagotchi/.binpath
@@ -1 +1 @@
-../target/wasm32-unknown-unknown/release/tmg
+../target/wasm32-unknown-unknown/debug/tmg
diff --git a/contracts/tamagotchi-battle/contracts/tamagotchi/Cargo.toml b/contracts/tamagotchi-battle/contracts/tamagotchi/Cargo.toml
@@ -4,14 +4,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-gstd = { git = "https://github.com/gear-tech/gear.git", features = ["debug"], branch = "stable" }
+gstd = { git = "https://github.com/gear-tech/gear.git", features = ["debug"], branch = "testnet" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive", "full"] }
 tmg-io = { path = "io" }
 
 [build-dependencies]
-gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git" , branch = "stable" }
+gear-wasm-builder = { git = "https://github.com/gear-tech/gear.git" , branch = "testnet" }
 tmg-io = { path = "io" }
 
 [dev-dependencies]
-gtest = { git = "https://github.com/gear-tech/gear.git", branch = "stable" }
+gtest = { git = "https://github.com/gear-tech/gear.git", branch = "testnet" }
diff --git a/contracts/tamagotchi-battle/contracts/tamagotchi/io/Cargo.toml b/contracts/tamagotchi-battle/contracts/tamagotchi/io/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-gmeta = {  git = "https://github.com/gear-tech/gear.git" , branch = "stable" }
-gstd = { git = "https://github.com/gear-tech/gear.git" , branch = "stable"}
+gmeta = {  git = "https://github.com/gear-tech/gear.git" , branch = "testnet" }
+gstd = { git = "https://github.com/gear-tech/gear.git" , branch = "testnet"}
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive", "full"] }