make check and make test working

updates to impl design doc

Author: shannonwells

common/primitives/src/capacity.rs

@@ -1,13 +1,9 @@
+use crate::msa::MessageSourceId;
 use codec::{Encode, MaxEncodedLen};
-use crate::{
-	msa::MessageSourceId,
-};
 use frame_support::traits::tokens::Balance;
 use scale_info::TypeInfo;
 use sp_api::Decode;
-use sp_runtime::{
-	DispatchError,
-};
+use sp_runtime::DispatchError;
 
 /// A trait for checking that a target MSA can be staked to.
 pub trait TargetValidator {

pallets/capacity/src/tests/mock.rs

@@ -14,6 +14,9 @@ use sp_runtime::{
 	traits::{BlakeTwo256, Convert, IdentityLookup},
 	AccountId32, BuildStorage, DispatchError, Perbill,
 };
+// use common_primitives::node::{Balance, Hash, RewardEra};
+use common_primitives::node::RewardEra;
+// use crate::{BalanceOf, StakingRewardClaim, StakingRewardsProvider};
 
 type Block = frame_system::mocking::MockBlockU32<Test>;
 
@@ -128,6 +131,25 @@ impl pallet_msa::Config for Test {
 	type MaxSignaturesStored = ConstU32<8000>;
 }
 
+// pub struct TestStakingRewardsProvider {}
+// impl StakingRewardsProvider<Test> for TestStakingRewardsProvider {
+// 	fn reward_pool_size(era: RewardEra) -> BalanceOf<Test> {
+// 		Balance::from(10_000u64);
+// 	}
+//
+// 	fn staking_reward_total(account_id: AccountId, from_era: RewardEra, to_era: RewardEra) -> BalanceOf<Test> {
+// 		Balance::from(10u64)
+// 	}
+//
+// 	fn validate_staking_reward_claim(account_id: AccountId, proof: Hash, payload: StakingRewardClaim<Test>) -> bool {
+// 		true
+// 	}
+//
+// 	fn payout_eligible(account_id: AccountId) -> bool {
+// 		true
+// 	}
+// }
+
 // Needs parameter_types! for the Perbill
 parameter_types! {
 	pub const TestCapacityPerToken: Perbill = Perbill::from_percent(10);
@@ -149,6 +171,10 @@ impl pallet_capacity::Config for Test {
 	type MaxEpochLength = ConstU32<100>;
 	type EpochNumber = u32;
 	type CapacityPerToken = TestCapacityPerToken;
+	type RewardEra = u32;
+	type EraLength = ConstU32<10>;
+	type StakingRewardsPastErasMax = ConstU32<5>;
+	// type RewardsProvider = TestStakingRewardsProvider;
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {

pallets/frequency-tx-payment/src/tests/mock.rs

@@ -216,6 +216,9 @@ impl pallet_capacity::Config for Test {
 	type MaxEpochLength = ConstU32<100>;
 	type EpochNumber = u32;
 	type CapacityPerToken = TestCapacityPerToken;
+	type RewardEra = u32;
+	type EraLength = ConstU32<5>;
+	type StakingRewardsPastErasMax = ConstU32<2>;
 }
 
 use pallet_balances::Call as BalancesCall;

runtime/frequency/src/lib.rs

@@ -72,7 +72,7 @@ pub use common_runtime::{
 };
 use frame_support::traits::Contains;
 
-use common_primitives::capacity::StakingRewardsProvider;
+// use common_primitives::capacity::StakingRewardsProvider;
 #[cfg(feature = "try-runtime")]
 use frame_support::traits::{TryStateSelect, UpgradeCheckSelect};
 
@@ -415,10 +415,10 @@ impl pallet_capacity::Config for Runtime {
 	type MaxEpochLength = CapacityMaxEpochLength;
 	type EpochNumber = u32;
 	type CapacityPerToken = CapacityPerToken;
-	type Era = RewardEra;
+	type RewardEra = RewardEra;
 	type EraLength = ConstU32<{ 14 * DAYS }>;
 	type StakingRewardsPastErasMax = ConstU32<26u32>; // 1 year
-	type RewardsProvider = StakingRewardsProvider;
+												  // type RewardsProvider = StakingRewardsProvider;
 }
 
 impl pallet_schemas::Config for Runtime {
@@ -746,7 +746,7 @@ use pallet_frequency_tx_payment::Call as FrequencyPaymentCall;
 use pallet_handles::Call as HandlesCall;
 use pallet_messages::Call as MessagesCall;
 use pallet_msa::Call as MsaCall;
-use pallet_stateful_storage::{types::ItemAction::Delete, Call as StatefulStorageCall};
+use pallet_stateful_storage::Call as StatefulStorageCall;
 
 pub struct CapacityEligibleCalls;
 impl GetStableWeight<RuntimeCall, Weight> for CapacityEligibleCalls {