fix warnings, fix e2e test

fix capacity import in api-augment remove unused constant use ProviderBoostHistoryLimit value set in parameter_types bump spec_version
frequency-chain · Oct 30, 2024 · 52b5d76 · 52b5d76
1 parent fcc9f17
commit 52b5d76
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/e2e/capacity/list_unclaimed_rewards.test.ts b/e2e/capacity/list_unclaimed_rewards.test.ts
@@ -38,7 +38,6 @@ describe('Capacity: list_unclaimed_rewards', function () {
     if (isTestnet()) this.skip();
 
     const [_provider, booster] = await setUpForBoosting('booster2', 'provider2');
-    console.debug(`Booster pubkey: ${booster.address}`);
 
     // Move out of the era we boosted inside of
     await ExtrinsicHelper.runToBlock(await getNextRewardEraBlock());

diff --git a/js/api-augment/definitions/index.ts b/js/api-augment/definitions/index.ts
@@ -8,4 +8,4 @@ export { default as statefulStorage } from './statefulStorage.js';
 export { default as handles } from './handles.js';
 export { default as frequency } from './frequency.js';
 export { default as frequencyTxPayment } from './frequencyTxPayment.js';
-export { default as capacity } from './capacity';
+export { default as capacity } from './capacity.js';
diff --git a/runtime/common/src/constants.rs b/runtime/common/src/constants.rs
@@ -403,6 +403,4 @@ parameter_types! {
 pub type CapacityRewardEraLength =
 	ConstU32<{ prod_or_testnet_or_local!(14 * DAYS, 1 * HOURS, 50) }>;
 
-pub type CapacityChangeStakingTargetThawEras = ConstU32<5>;
-
 // -end- Capacity Pallet ---
diff --git a/runtime/frequency/src/lib.rs b/runtime/frequency/src/lib.rs
@@ -109,20 +109,14 @@ pub use pallet_time_release;
 // Polkadot Imports
 use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
 
+use common_runtime::weights::rocksdb_weights::constants::RocksDbWeight;
 pub use common_runtime::{
 	constants::MaxSchemaGrants,
 	weights,
 	weights::{block_weights::BlockExecutionWeight, extrinsic_weights::ExtrinsicBaseWeight},
 };
 use frame_support::traits::Contains;
 
-use common_primitives::{
-	msa::MessageSourceId,
-	schema::SchemaId,
-	stateful_storage::{PageHash, PageId},
-};
-use common_runtime::weights::rocksdb_weights::constants::RocksDbWeight;
-
 mod genesis;
 
 /// Interface to collective pallet to propose a proposal.
@@ -409,7 +403,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("frequency"),
 	impl_name: create_runtime_str!("frequency"),
 	authoring_version: 1,
-	spec_version: 125,
+	spec_version: 130,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -423,7 +417,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("frequency-testnet"),
 	impl_name: create_runtime_str!("frequency"),
 	authoring_version: 1,
-	spec_version: 125,
+	spec_version: 130,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -586,8 +580,8 @@ impl pallet_capacity::Config for Runtime {
 	type EpochNumber = u32;
 	type CapacityPerToken = CapacityPerToken;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
-	type EraLength = ConstU32<{ 14 * DAYS }>;
-	type ProviderBoostHistoryLimit = ConstU32<30u32>;
+	type EraLength = CapacityRewardEraLength;
+	type ProviderBoostHistoryLimit = ProviderBoostHistoryLimit;
 	type RewardsProvider = Capacity;
 	type MaxRetargetsPerRewardEra = ConstU32<2>;
 	// Value determined by desired inflation rate limits for chosen economic model