Abstract sparse vector type

AstarNetwork · Aug 30, 2023 · 1473890 · 1473890
1 parent 91038ed
commit 1473890
Show file tree

Hide file tree

Showing 6 changed files with 255 additions and 187 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/dapp-staking-v3/Cargo.toml b/pallets/dapp-staking-v3/Cargo.toml
@@ -21,6 +21,8 @@ sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
+astar-primitives = { workspace = true }
+
 [dev-dependencies]
 pallet-balances = { workspace = true }
 
@@ -39,4 +41,5 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"pallet-balances/std",
+	"astar-primitives/std",
 ]
diff --git a/pallets/dapp-staking-v3/src/lib.rs b/pallets/dapp-staking-v3/src/lib.rs
@@ -47,6 +47,8 @@ use frame_support::{
 use frame_system::pallet_prelude::*;
 use sp_runtime::traits::{BadOrigin, Saturating, Zero};
 
+use astar_primitives::Balance;
+
 use crate::types::*;
 pub use pallet::*;
 
@@ -74,7 +76,11 @@ pub mod pallet {
         type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
         /// Currency used for staking.
-        type Currency: LockableCurrency<Self::AccountId, Moment = Self::BlockNumber>;
+        type Currency: LockableCurrency<
+            Self::AccountId,
+            Moment = Self::BlockNumber,
+            Balance = Balance,
+        >;
 
         /// Describes smart contract in the context required by dApp staking.
         type SmartContract: Parameter + Member + MaxEncodedLen;
@@ -97,7 +103,7 @@ pub mod pallet {
 
         /// Minimum amount an account has to lock in dApp staking in order to participate.
         #[pallet::constant]
-        type MinimumLockedAmount: Get<BalanceOf<Self>>;
+        type MinimumLockedAmount: Get<Balance>;
 
         /// Amount of blocks that need to pass before unlocking chunks can be claimed by the owner.
         #[pallet::constant]
@@ -196,7 +202,7 @@ pub mod pallet {
 
     /// General information about the current era.
     #[pallet::storage]
-    pub type CurrentEraInfo<T: Config> = StorageValue<_, EraInfo<BalanceOf<T>>, ValueQuery>;
+    pub type CurrentEraInfo<T: Config> = StorageValue<_, EraInfo, ValueQuery>;
 
     #[pallet::call]
     impl<T: Config> Pallet<T> {

diff --git a/pallets/dapp-staking-v3/src/test/testing_utils.rs b/pallets/dapp-staking-v3/src/test/testing_utils.rs
@@ -32,7 +32,7 @@ use std::collections::HashMap;
 pub(crate) struct MemorySnapshot {
     active_protocol_state: ProtocolState<BlockNumberFor<Test>>,
     next_dapp_id: DAppId,
-    current_era_info: EraInfo<BalanceOf<Test>>,
+    current_era_info: EraInfo,
     integrated_dapps: HashMap<
         <Test as pallet_dapp_staking::Config>::SmartContract,
         DAppInfo<<Test as frame_system::Config>::AccountId>,