refactor: enforce no runtime in pallet (#349)

* refactor: clean inflation pallet of runtime code * refactor: clean pallet did lookup of runtime code * refactor: move parameter to common * refactor: clean pallet did of runtime references * refactor: clean kilt launch of runtime code * refactor: clean parachain-staking of runtime code (cherry picked from commit c724119)
KILTprotocol · Jun 23, 2022 · f9738f8 · f9738f8
1 parent 73f1b66
commit f9738f8
Show file tree

Hide file tree

Showing 31 changed files with 527 additions and 603 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/nodes/parachain/src/chain_spec/peregrine.rs b/nodes/parachain/src/chain_spec/peregrine.rs
@@ -21,12 +21,12 @@
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
 use peregrine_runtime::{
-	BalancesConfig, CouncilConfig, GenesisConfig, InflationInfo, KiltLaunchConfig, MinCollatorStake,
-	ParachainInfoConfig, ParachainStakingConfig, SessionConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
-	VestingConfig, WASM_BINARY,
+	BalancesConfig, CouncilConfig, GenesisConfig, InflationInfo, KiltLaunchConfig, ParachainInfoConfig,
+	ParachainStakingConfig, SessionConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig, VestingConfig,
+	WASM_BINARY,
 };
 use runtime_common::{
-	constants::{INFLATION_CONFIG, MAX_COLLATOR_STAKE},
+	constants::{kilt_inflation_config, staking::MinCollatorStake, MAX_COLLATOR_STAKE},
 	AccountId, AuthorityId, Balance, BlockNumber,
 };
 use sc_service::ChainType;
@@ -138,10 +138,6 @@ pub fn make_new_spec() -> Result<ChainSpec, String> {
 	))
 }
 
-pub fn kilt_inflation_config() -> InflationInfo {
-	InflationInfo::from(INFLATION_CONFIG)
-}
-
 #[allow(clippy::too_many_arguments)]
 fn testnet_genesis(
 	wasm_binary: &[u8],

diff --git a/nodes/parachain/src/chain_spec/spiritnet.rs b/nodes/parachain/src/chain_spec/spiritnet.rs
@@ -21,17 +21,16 @@
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
 use runtime_common::{
-	constants::{INFLATION_CONFIG, KILT, MAX_COLLATOR_STAKE},
+	constants::{kilt_inflation_config, staking::MinCollatorStake, KILT, MAX_COLLATOR_STAKE},
 	AccountId, AuthorityId, Balance, BlockNumber,
 };
 use sc_service::ChainType;
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, sr25519};
 use sp_runtime::traits::Zero;
 use spiritnet_runtime::{
-	BalancesConfig, CouncilConfig, GenesisConfig, InflationInfo, KiltLaunchConfig, MinCollatorStake,
-	ParachainInfoConfig, ParachainStakingConfig, SessionConfig, SystemConfig, TechnicalCommitteeConfig, VestingConfig,
-	WASM_BINARY,
+	BalancesConfig, CouncilConfig, GenesisConfig, InflationInfo, KiltLaunchConfig, ParachainInfoConfig,
+	ParachainStakingConfig, SessionConfig, SystemConfig, TechnicalCommitteeConfig, VestingConfig, WASM_BINARY,
 };
 
 use crate::chain_spec::{get_account_id_from_seed, get_from_seed, DEFAULT_PARA_ID, TELEMETRY_URL};
@@ -244,10 +243,6 @@ pub fn load_spiritnet_spec() -> Result<ChainSpec, String> {
 	ChainSpec::from_json_bytes(&include_bytes!("../../res/spiritnet.json")[..])
 }
 
-pub fn kilt_inflation_config() -> InflationInfo {
-	InflationInfo::from(INFLATION_CONFIG)
-}
-
 #[allow(clippy::too_many_arguments)]
 fn testnet_genesis(
 	wasm_binary: &[u8],

diff --git a/pallets/attestation/src/mock.rs b/pallets/attestation/src/mock.rs
@@ -156,13 +156,11 @@ pub(crate) mod runtime {
 	use ctype::CtypeCreatorOf;
 	use frame_support::{parameter_types, weights::constants::RocksDbWeight};
 	use sp_core::{ed25519, sr25519, Pair};
-	use sp_keystore::{testing::KeyStore, KeystoreExt};
 	use sp_runtime::{
 		testing::Header,
 		traits::{BlakeTwo256, IdentifyAccount, IdentityLookup, Verify},
 		MultiSignature, MultiSigner,
 	};
-	use std::sync::Arc;
 
 	use kilt_support::mock::{mock_origin, SubjectId};
 
@@ -368,8 +366,8 @@ pub(crate) mod runtime {
 		pub fn build_with_keystore(self) -> sp_io::TestExternalities {
 			let mut ext = self.build();
 
-			let keystore = KeyStore::new();
-			ext.register_extension(KeystoreExt(Arc::new(keystore)));
+			let keystore = sp_keystore::testing::KeyStore::new();
+			ext.register_extension(sp_keystore::KeystoreExt(std::sync::Arc::new(keystore)));
 
 			ext
 		}

diff --git a/pallets/delegation/src/mock.rs b/pallets/delegation/src/mock.rs
@@ -176,13 +176,11 @@ pub(crate) mod runtime {
 	use codec::Encode;
 	use frame_support::{parameter_types, weights::constants::RocksDbWeight};
 	use sp_core::{ed25519, sr25519, Pair};
-	use sp_keystore::{testing::KeyStore, KeystoreExt};
 	use sp_runtime::{
 		testing::Header,
 		traits::{BlakeTwo256, IdentifyAccount, IdentityLookup, Verify},
 		MultiSignature, MultiSigner,
 	};
-	use sp_std::sync::Arc;
 
 	use attestation::{mock::insert_attestation, AttestationDetails, ClaimHashOf};
 	use kilt_support::{
@@ -510,8 +508,8 @@ pub(crate) mod runtime {
 		pub fn build_with_keystore(self) -> sp_io::TestExternalities {
 			let mut ext = self.build();
 
-			let keystore = KeyStore::new();
-			ext.register_extension(KeystoreExt(Arc::new(keystore)));
+			let keystore = sp_keystore::testing::KeyStore::new();
+			ext.register_extension(sp_keystore::KeystoreExt(sp_std::sync::Arc::new(keystore)));
 
 			ext
 		}

diff --git a/pallets/did/Cargo.toml b/pallets/did/Cargo.toml
@@ -17,17 +17,18 @@ env_logger = {version = "0.8.3"}
 serde = {version = "1.0.132"}
 
 ctype = {features = ["mock"], path = "../ctype"}
+
+frame-benchmarking = {branch = "polkadot-v0.9.17", default-features = false, git = "https://github.com/paritytech/substrate"}
 pallet-balances = {branch = "polkadot-v0.9.17", default-features = false, git = "https://github.com/paritytech/substrate"}
-runtime-common = {default-features = false, path = "../../runtimes/common"}
+sp-keystore = {branch = "polkadot-v0.9.17", default-features = false, git = "https://github.com/paritytech/substrate"}
 
 [dependencies]
 # Internal dependencies
-ctype = {optional = true, path = "../ctype"}
+ctype = {path = "../ctype", optional = true}
 kilt-support = {default-features = false, path = "../../support"}
-runtime-common = {default-features = false, path = "../../runtimes/common"}
 
 # External dependencies
-env_logger = {default-features = false, optional = true, version = "0.8.3"}
+env_logger = {default-features = false, version = "0.8.3", optional = true}
 hex = {default-features = false, features = ["alloc"], version = "0.4.2"}
 log = "0.4"
 
@@ -42,7 +43,7 @@ sp-std = {branch = "polkadot-v0.9.17", default-features = false, git = "https://
 
 # benchmarking
 frame-benchmarking = {branch = "polkadot-v0.9.17", default-features = false, git = "https://github.com/paritytech/substrate", optional = true}
-pallet-balances = {optional = true, branch = "polkadot-v0.9.17", default-features = false, git = "https://github.com/paritytech/substrate"}
+pallet-balances = {branch = "polkadot-v0.9.17", default-features = false, git = "https://github.com/paritytech/substrate", optional = true}
 sp-keystore = {branch = "polkadot-v0.9.17", default-features = false, git = "https://github.com/paritytech/substrate", optional = true}
 
 [features]
@@ -66,7 +67,6 @@ std = [
   "frame-support/std",
   "frame-system/std",
   "hex/std",
-  "runtime-common/std",
   "kilt-support/std",
   "kilt-support/std",
   "log/std",

diff --git a/pallets/did/src/benchmarking.rs b/pallets/did/src/benchmarking.rs
@@ -23,10 +23,9 @@ use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, Zero};
 use frame_support::{assert_ok, traits::Currency};
 use frame_system::RawOrigin;
 use kilt_support::signature::VerifySignature;
-use runtime_common::AccountId;
 use sp_core::{crypto::KeyTypeId, ecdsa, ed25519, sr25519};
 use sp_io::crypto::{ecdsa_generate, ecdsa_sign, ed25519_generate, ed25519_sign, sr25519_generate, sr25519_sign};
-use sp_runtime::{traits::IdentifyAccount, MultiSigner};
+use sp_runtime::{traits::IdentifyAccount, AccountId32, MultiSigner};
 use sp_std::{convert::TryInto, vec::Vec};
 
 use crate::{
@@ -118,9 +117,9 @@ fn save_service_endpoints<T: Config>(did_subject: &DidIdentifierOf<T>, endpoints
 benchmarks! {
 	where_clause {
 		where
-		T::DidIdentifier: From<AccountId>,
+		T::DidIdentifier: From<AccountId32>,
 		<T as frame_system::Config>::Origin: From<RawOrigin<T::DidIdentifier>>,
-		<T as frame_system::Config>::AccountId: From<AccountId>,
+		<T as frame_system::Config>::AccountId: From<AccountId32>,
 	}
 
 	/* create extrinsic */

diff --git a/pallets/did/src/did_details.rs b/pallets/did/src/did_details.rs
@@ -177,7 +177,7 @@ pub trait DidVerifiableIdentifier {
 	) -> Result<DidVerificationKey, SignatureError>;
 }
 
-impl DidVerifiableIdentifier for runtime_common::DidIdentifier {
+impl<I: AsRef<[u8; 32]>> DidVerifiableIdentifier for I {
 	fn verify_and_recover_signature(
 		&self,
 		payload: &Payload,