Skip to content

Commit

Permalink
Merge branch 'main' into feat/generate-types-json-#2062
Browse files Browse the repository at this point in the history
  • Loading branch information
@shannonwells
shannonwells authored Oct 7, 2024
2 parents 7d34251 + 2525cd3 commit 8b14bd9
Show file tree
Hide file tree
Showing 23 changed files with 724 additions and 722 deletions.
24 changes: 1 addition & 23 deletions node/service/src/chain_spec/frequency.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,6 @@ pub fn load_frequency_spec() -> ChainSpec {
.unwrap()
}

#[allow(clippy::unwrap_used)]
fn frequency_genesis_config() -> serde_json::Value {
let mut output: serde_json::Value =
serde_json::from_slice(include_bytes!("../../../../resources/frequency.json").as_slice())
.map_err(|e| format!("Invalid JSON blob {:?}", e))
.unwrap();

if let Some(runtime) = output["genesis"]["runtime"].as_object_mut() {
runtime.remove("vesting");
runtime["parachainSystem"] = serde_json::json!({});
runtime["treasury"] = serde_json::json!({});
runtime["auraExt"] = serde_json::json!({});
}

if let Some(system) = output["genesis"]["runtime"]["system"].as_object_mut() {
system.remove("code");
}

let runtime = &output["genesis"]["runtime"];
runtime.clone()
}

#[allow(clippy::unwrap_used)]
pub fn benchmark_mainnet_config() -> ChainSpec {
let properties =
Expand All @@ -60,6 +38,6 @@ pub fn benchmark_mainnet_config() -> ChainSpec {
"/dns4/0.boot.frequency.xyz/tcp/30333/ws/p2p/12D3KooWBd4aEArNvXECtt2JHQACBdFmeafpyfre3q81iM1xCcpP".parse().unwrap(),
"/dns4/1.boot.frequency.xyz/tcp/30333/ws/p2p/12D3KooWCW8d7Yz2d3Jcb49rWcNppRNEs1K2NZitCpPtrHSQb6dw".parse().unwrap(),
])
.with_genesis_config_patch(frequency_genesis_config())
.with_genesis_config_preset_name("frequency")
.build()
}
44 changes: 22 additions & 22 deletions pallets/capacity/src/weights.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//! Autogenerated weights for `pallet_capacity`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-09-04, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-10-03, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ip-10-173-10-33`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! HOSTNAME: `ip-10-173-10-189`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("frequency-bench")`, DB CACHE: `1024`

// Executed Command:
Expand Down Expand Up @@ -61,8 +61,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `174`
// Estimated: `5259`
// Minimum execution time: 37_795_000 picoseconds.
Weight::from_parts(38_834_000, 5259)
// Minimum execution time: 37_668_000 picoseconds.
Weight::from_parts(38_521_000, 5259)
.saturating_add(T::DbWeight::get().reads(7_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
Expand All @@ -78,8 +78,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `285`
// Estimated: `5259`
// Minimum execution time: 25_033_000 picoseconds.
Weight::from_parts(25_536_000, 5259)
// Minimum execution time: 24_953_000 picoseconds.
Weight::from_parts(25_777_000, 5259)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
Expand All @@ -91,8 +91,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `1984`
// Minimum execution time: 2_221_000 picoseconds.
Weight::from_parts(2_294_000, 1984)
// Minimum execution time: 2_111_000 picoseconds.
Weight::from_parts(2_236_000, 1984)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
Expand All @@ -108,8 +108,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `271`
// Estimated: `4081`
// Minimum execution time: 24_068_000 picoseconds.
Weight::from_parts(24_809_000, 4081)
// Minimum execution time: 24_341_000 picoseconds.
Weight::from_parts(24_776_000, 4081)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
Expand All @@ -119,8 +119,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 3_840_000 picoseconds.
Weight::from_parts(4_067_000, 0)
// Minimum execution time: 4_007_000 picoseconds.
Weight::from_parts(4_219_000, 0)
.saturating_add(T::DbWeight::get().writes(1_u64))
}
}
Expand All @@ -145,8 +145,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `174`
// Estimated: `5259`
// Minimum execution time: 37_795_000 picoseconds.
Weight::from_parts(38_834_000, 5259)
// Minimum execution time: 37_668_000 picoseconds.
Weight::from_parts(38_521_000, 5259)
.saturating_add(RocksDbWeight::get().reads(7_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
Expand All @@ -162,8 +162,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `285`
// Estimated: `5259`
// Minimum execution time: 25_033_000 picoseconds.
Weight::from_parts(25_536_000, 5259)
// Minimum execution time: 24_953_000 picoseconds.
Weight::from_parts(25_777_000, 5259)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
Expand All @@ -175,8 +175,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `1984`
// Minimum execution time: 2_221_000 picoseconds.
Weight::from_parts(2_294_000, 1984)
// Minimum execution time: 2_111_000 picoseconds.
Weight::from_parts(2_236_000, 1984)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
Expand All @@ -192,8 +192,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `271`
// Estimated: `4081`
// Minimum execution time: 24_068_000 picoseconds.
Weight::from_parts(24_809_000, 4081)
// Minimum execution time: 24_341_000 picoseconds.
Weight::from_parts(24_776_000, 4081)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
Expand All @@ -203,8 +203,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 3_840_000 picoseconds.
Weight::from_parts(4_067_000, 0)
// Minimum execution time: 4_007_000 picoseconds.
Weight::from_parts(4_219_000, 0)
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
}
Expand Down
28 changes: 14 additions & 14 deletions pallets/frequency-tx-payment/src/weights.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//! Autogenerated weights for `pallet_frequency_tx_payment`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-09-04, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-10-03, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ip-10-173-10-33`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! HOSTNAME: `ip-10-173-10-189`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("frequency-bench")`, DB CACHE: `1024`

// Executed Command:
Expand Down Expand Up @@ -44,18 +44,18 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 3_096_000 picoseconds.
Weight::from_parts(3_267_000, 0)
// Minimum execution time: 3_086_000 picoseconds.
Weight::from_parts(3_326_000, 0)
}
/// The range of component `n` is `[0, 10]`.
fn pay_with_capacity_batch_all(n: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 5_018_000 picoseconds.
Weight::from_parts(5_849_351, 0)
// Standard Error: 9_305
.saturating_add(Weight::from_parts(3_104_086, 0).saturating_mul(n.into()))
// Minimum execution time: 5_080_000 picoseconds.
Weight::from_parts(6_288_647, 0)
// Standard Error: 11_277
.saturating_add(Weight::from_parts(3_105_852, 0).saturating_mul(n.into()))
}
}

Expand All @@ -65,18 +65,18 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 3_096_000 picoseconds.
Weight::from_parts(3_267_000, 0)
// Minimum execution time: 3_086_000 picoseconds.
Weight::from_parts(3_326_000, 0)
}
/// The range of component `n` is `[0, 10]`.
fn pay_with_capacity_batch_all(n: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 5_018_000 picoseconds.
Weight::from_parts(5_849_351, 0)
// Standard Error: 9_305
.saturating_add(Weight::from_parts(3_104_086, 0).saturating_mul(n.into()))
// Minimum execution time: 5_080_000 picoseconds.
Weight::from_parts(6_288_647, 0)
// Standard Error: 11_277
.saturating_add(Weight::from_parts(3_105_852, 0).saturating_mul(n.into()))
}
}

Expand Down
44 changes: 22 additions & 22 deletions pallets/handles/src/weights.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//! Autogenerated weights for `pallet_handles`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-09-04, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-10-03, STEPS: `20`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ip-10-173-10-33`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! HOSTNAME: `ip-10-173-10-189`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("frequency-bench")`, DB CACHE: `1024`

// Executed Command:
Expand Down Expand Up @@ -54,10 +54,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `116`
// Estimated: `4019`
// Minimum execution time: 68_677_000 picoseconds.
Weight::from_parts(70_300_113, 4019)
// Standard Error: 9_562
.saturating_add(Weight::from_parts(85_735, 0).saturating_mul(b.into()))
// Minimum execution time: 64_246_000 picoseconds.
Weight::from_parts(65_436_069, 4019)
// Standard Error: 8_452
.saturating_add(Weight::from_parts(85_489, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(3_u64))
}
Expand All @@ -74,10 +74,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `222 + b * (1 ±0)`
// Estimated: `4019`
// Minimum execution time: 77_227_000 picoseconds.
Weight::from_parts(78_870_608, 4019)
// Standard Error: 7_816
.saturating_add(Weight::from_parts(170_182, 0).saturating_mul(b.into()))
// Minimum execution time: 77_229_000 picoseconds.
Weight::from_parts(78_047_988, 4019)
// Standard Error: 8_497
.saturating_add(Weight::from_parts(160_502, 0).saturating_mul(b.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
Expand All @@ -91,8 +91,8 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Proof Size summary in bytes:
// Measured: `231`
// Estimated: `4019`
// Minimum execution time: 19_290_000 picoseconds.
Weight::from_parts(20_118_000, 4019)
// Minimum execution time: 19_028_000 picoseconds.
Weight::from_parts(19_409_000, 4019)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
Expand All @@ -113,10 +113,10 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `116`
// Estimated: `4019`
// Minimum execution time: 68_677_000 picoseconds.
Weight::from_parts(70_300_113, 4019)
// Standard Error: 9_562
.saturating_add(Weight::from_parts(85_735, 0).saturating_mul(b.into()))
// Minimum execution time: 64_246_000 picoseconds.
Weight::from_parts(65_436_069, 4019)
// Standard Error: 8_452
.saturating_add(Weight::from_parts(85_489, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(3_u64))
}
Expand All @@ -133,10 +133,10 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `222 + b * (1 ±0)`
// Estimated: `4019`
// Minimum execution time: 77_227_000 picoseconds.
Weight::from_parts(78_870_608, 4019)
// Standard Error: 7_816
.saturating_add(Weight::from_parts(170_182, 0).saturating_mul(b.into()))
// Minimum execution time: 77_229_000 picoseconds.
Weight::from_parts(78_047_988, 4019)
// Standard Error: 8_497
.saturating_add(Weight::from_parts(160_502, 0).saturating_mul(b.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(4_u64))
}
Expand All @@ -150,8 +150,8 @@ impl WeightInfo for () {
// Proof Size summary in bytes:
// Measured: `231`
// Estimated: `4019`
// Minimum execution time: 19_290_000 picoseconds.
Weight::from_parts(20_118_000, 4019)
// Minimum execution time: 19_028_000 picoseconds.
Weight::from_parts(19_409_000, 4019)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
Expand Down
Loading

0 comments on commit 8b14bd9

Please sign in to comment.