Allow launch to accept any string (#239)

* Allow launch to accept any string * launch H256 * Update tests * Update tests and dependencies
airalab · Feb 18, 2022 · 4906440 · 4906440
1 parent 5be0fb9
commit 4906440
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame/launch/Cargo.toml b/frame/launch/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pallet-robonomics-launch"
 description = "Robonomics Network robot launch Substrate runtime module"
-version = "0.3.1"
+version = "0.4.0"
 authors = ["Airalab <[email protected]>"]
 edition = "2018"
 
@@ -12,6 +12,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false }
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true }
+bs58 = "0.4.0"
 
 [dev-dependencies]
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" }

diff --git a/frame/launch/src/lib.rs b/frame/launch/src/lib.rs
@@ -139,7 +139,8 @@ mod tests {
     }
 
     impl Config for Runtime {
-        type Parameter = bool;
+        //type Parameter = bool;
+        type Parameter = H256;
         type Event = Event;
     }
 
@@ -150,11 +151,17 @@ mod tests {
         storage.into()
     }
 
+    use bs58;
     #[test]
     fn test_store_data() {
         new_test_ext().execute_with(|| {
             let sender = 1;
-            let param = true;
+            //let param = true;
+            let mut decoded = [0; 34];
+            bs58::decode("QmY91yTMHzAd9csvKtPF1b1NS5CVhdoSRz2CBwTGTxkvST")
+                .into(&mut decoded)
+                .expect("Couldn't decode from Base58");
+            let param = H256::from_slice(&decoded[2..34]);
             let data = 0;
             assert_ok!(Launch::launch(Origin::signed(sender), data, param.clone()));
         })

diff --git a/runtime/alpha/Cargo.toml b/runtime/alpha/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alpha-runtime"
-version = "1.7.0"
+version = "1.7.1"
 authors = ["Airalab <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/runtime/alpha/src/lib.rs b/runtime/alpha/src/lib.rs
@@ -59,7 +59,7 @@ use sp_api::impl_runtime_apis;
 use sp_core::{
     crypto::KeyTypeId,
     u32_trait::{_1, _2, _3, _5},
-    OpaqueMetadata,
+    OpaqueMetadata, H256,
 };
 use sp_runtime::{
     create_runtime_str, generic, impl_opaque_keys,
@@ -664,7 +664,7 @@ impl pallet_robonomics_datalog::Config for Runtime {
 }
 
 impl pallet_robonomics_launch::Config for Runtime {
-    type Parameter = bool;
+    type Parameter = H256;
     type Event = Event;
 }
 

diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "local-runtime"
-version = "1.7.0"
+version = "1.7.1"
 authors = ["Airalab <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs
@@ -55,7 +55,7 @@ use robonomics_primitives::{AccountId, Balance, BlockNumber, Hash, Index, Moment
 use sp_api::impl_runtime_apis;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::u32_trait::{_1, _2, _3};
-use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256};
 use sp_inherents::{CheckInherentsResult, InherentData};
 use sp_runtime::traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, NumberFor};
 use sp_runtime::transaction_validity::{TransactionSource, TransactionValidity};
@@ -486,7 +486,7 @@ impl pallet_robonomics_datalog::Config for Runtime {
 }
 
 impl pallet_robonomics_launch::Config for Runtime {
-    type Parameter = bool;
+    type Parameter = H256;
     type Event = Event;
 }
 

diff --git a/runtime/main/Cargo.toml b/runtime/main/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "main-runtime"
-version = "1.7.0"
+version = "1.7.1"
 authors = ["Airalab <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/runtime/main/src/lib.rs b/runtime/main/src/lib.rs
@@ -52,7 +52,7 @@ use pallet_transaction_payment_rpc_runtime_api::{FeeDetails, RuntimeDispatchInfo
 use robonomics_primitives::{AccountId, Balance, BlockNumber, Hash, Index, Moment, Signature};
 use sp_api::impl_runtime_apis;
 use sp_core::u32_trait::{_1, _2, _3};
-use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256};
 use sp_runtime::{
     create_runtime_str, generic, impl_opaque_keys,
     traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto},
@@ -522,7 +522,7 @@ impl pallet_robonomics_datalog::Config for Runtime {
 }
 
 impl pallet_robonomics_launch::Config for Runtime {
-    type Parameter = bool;
+    type Parameter = H256;
     type Event = Event;
 }