updates after rebase

common/primitives/src/capacity.rs

@@ -1,8 +1,5 @@
 use crate::msa::MessageSourceId;
-use codec::{Encode, MaxEncodedLen};
 use frame_support::traits::tokens::Balance;
-use scale_info::TypeInfo;
-use sp_api::Decode;
 use sp_runtime::DispatchError;
 
 /// A trait for checking that a target MSA can be staked to.
@@ -55,21 +52,3 @@ pub trait Replenishable {
 	/// Checks if an account can be replenished.
 	fn can_replenish(msa_id: MessageSourceId) -> bool;
 }
-
-#[derive(
-	Clone, Copy, Debug, Decode, Encode, TypeInfo, Eq, MaxEncodedLen, PartialEq, PartialOrd,
-)]
-/// The type of staking a given Staking Account is doing.
-pub enum StakingType {
-	/// Staking account targets Providers for capacity only, no token reward
-	MaximumCapacity,
-	/// Staking account targets Providers and splits reward between capacity to the Provider
-	/// and token for the account holder
-	ProviderBoost,
-}
-
-impl Default for StakingType {
-	fn default() -> Self {
-		StakingType::MaximumCapacity
-	}
-}

designdocs/capacity.md

@@ -117,7 +117,7 @@ Stakes some amount of tokens to the network and generates Capacity.
 ///
 /// - Returns Error::InsufficientBalance if the sender does not have free balance amount needed to stake.
 /// - Returns Error::InvalidTarget if attempting to stake to an invalid target.
-/// - Returns Error::InsufficientStakingAmount if attempting to stake an amount below the minimum amount.
+/// - Returns Error::StakingAmountBelowMinimum if attempting to stake an amount below the minimum amount.
 /// - Returns Error::BalanceTooLowtoStake if the sender does not have
 ///           free balance amount > MinimumTokenBalance after staking.
 pub fn stake(origin: OriginFor<T>, target: MessageSourceId, amount: BalanceOf<T>) -> DispatchResult {}
@@ -211,7 +211,7 @@ pub enum Error<T> {
   /// Capacity is not available for the given MSA.
   InsufficientBalance,
   /// Staker is attempting to stake an amount below the minimum amount.
-  InsufficientStakingAmount,
+  StakingAmountBelowMinimum,
   /// Staker is attempting to stake a zero amount.
   ZeroAmountNotAllowed,
   /// Origin has no Staking Account

e2e/capacity/staking.test.ts

@@ -254,13 +254,13 @@ describe('Capacity Staking Tests', function () {
   });
 
   describe('when attempting to stake below the minimum staking requirements', function () {
-    it('should fail to stake for InsufficientStakingAmount', async function () {
+    it('should fail to stake for StakingAmountBelowMinimum', async function () {
       const stakingKeys = createKeys('stakingKeys');
       const providerId = await createMsaAndProvider(fundingSource, stakingKeys, 'stakingKeys', 150n * CENTS);
       const stakeAmount = 1500n;
 
       const failStakeObj = ExtrinsicHelper.stake(stakingKeys, providerId, stakeAmount);
-      await assert.rejects(failStakeObj.signAndSend(), { name: 'InsufficientStakingAmount' });
+      await assert.rejects(failStakeObj.signAndSend(), { name: 'StakingAmountBelowMinimum' });
     });
   });
 

pallets/capacity/src/benchmarking.rs

@@ -47,7 +47,7 @@ benchmarks! {
 
 		register_provider::<T>(target, "Foo");
 
-	}: _ (RawOrigin::Signed(caller.clone()), target, amount, staking_type)
+	}: _ (RawOrigin::Signed(caller.clone()), target, amount)
 	verify {
 		assert!(StakingAccountLedger::<T>::contains_key(&caller));
 		assert!(StakingTargetLedger::<T>::contains_key(&caller, target));