Skip to content

Commit

Permalink
https://github.com/pendulum-chain/pendulum/pull/242#discussion_r12387…
Browse files Browse the repository at this point in the history 
…57832,

#242 (comment),
  • Loading branch information
@b-yap
b-yap committed Jul 6, 2023
1 parent c44d446 commit 229af34
Show file tree
Hide file tree
Showing 7 changed files with 140 additions and 152 deletions.
272 changes: 131 additions & 141 deletions node/src/command.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,39 +162,87 @@ impl SubstrateCli for RelayChainCli {
}
}

macro_rules! construct_async_run {
(|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{

macro_rules! construct_sync_run {
(|$components:ident, $cli:ident, $cmd:ident, $config:ident| $code:expr ) => {{
let runner = $cli.create_runner($cmd)?;

match runner.config().chain_spec.identify() {
ChainIdentity::Amplitude => {
runner.async_run(|$config| {
let $components = new_partial::<amplitude_runtime::RuntimeApi, AmplitudeRuntimeExecutor>(&$config)?;
let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager))
})
},
ChainIdentity::Foucoco => {
runner.async_run(|$config| {
let $components = new_partial::<foucoco_runtime::RuntimeApi, FoucocoRuntimeExecutor>(&$config)?;
let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager))
})
},
ChainIdentity::Pendulum => {
runner.async_run(|$config| {
let $components = new_partial::<pendulum_runtime::RuntimeApi, PendulumRuntimeExecutor>(&$config)?;
let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager))
})
},
ChainIdentity::Development => {
runner.async_run(|$config| {
let $components = new_partial::<development_runtime::RuntimeApi, DevelopmentRuntimeExecutor>(&$config)?;
let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager))
})
}
ChainIdentity::Amplitude => runner.sync_run(|$config| {
let $components = new_partial::<
amplitude_runtime::RuntimeApi,
AmplitudeRuntimeExecutor,
>(&$config)?;
$code
}),
ChainIdentity::Foucoco => runner.sync_run(|$config| {
let $components = new_partial::<
foucoco_runtime::RuntimeApi,
FoucocoRuntimeExecutor,
>(&$config)?;
$code
}),
ChainIdentity::Pendulum => runner.sync_run(|$config| {
let $components = new_partial::<
pendulum_runtime::RuntimeApi,
PendulumRuntimeExecutor,
>(&$config)?;
$code
}),
ChainIdentity::Development => runner.sync_run(|$config| {
let $components = new_partial::<
development_runtime::RuntimeApi,
DevelopmentRuntimeExecutor,
>(&$config)?;
$code
}),
}
}};
}

macro_rules! construct_generic_async_run {
(|$components:ident, $cli:ident, $cmd:ident, $config:ident| $code:expr ) => {{
let runner = $cli.create_runner($cmd)?;

match runner.config().chain_spec.identify() {
ChainIdentity::Amplitude => runner.async_run(|$config| {
let $components = new_partial::<
amplitude_runtime::RuntimeApi,
AmplitudeRuntimeExecutor,
>(&$config)?;
$code
}),
ChainIdentity::Foucoco => runner.async_run(|$config| {
let $components = new_partial::<
foucoco_runtime::RuntimeApi,
FoucocoRuntimeExecutor,
>(&$config)?;
$code
}),
ChainIdentity::Pendulum => runner.async_run(|$config| {
let $components = new_partial::<
pendulum_runtime::RuntimeApi,
PendulumRuntimeExecutor,
>(&$config)?;
$code
}),
ChainIdentity::Development => runner.async_run(|$config| {
let $components = new_partial::<
development_runtime::RuntimeApi,
DevelopmentRuntimeExecutor,
>(&$config)?;
$code
}),
}
}};
}

macro_rules! construct_async_run {
(|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{
construct_generic_async_run!(|$components, $cli, $cmd, $config| {
let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager))
})
}}
}

Expand Down Expand Up @@ -266,120 +314,62 @@ pub fn run() -> Result<()> {
cmd.run(&*spec)
})
},
Some(Subcommand::Benchmark(cmd)) => {
let runner = cli.create_runner(cmd)?;
// Switch on the concrete benchmark sub-command-
match (cmd, runner.config().chain_spec.identify()) {
(BenchmarkCmd::Pallet(cmd), runtime) =>
if cfg!(feature = "runtime-benchmarks") {
match runtime {
ChainIdentity::Amplitude => runner.sync_run(|config| {
cmd.run::<Block, AmplitudeRuntimeExecutor>(config)
}),
ChainIdentity::Foucoco => runner.sync_run(|config| {
cmd.run::<Block, FoucocoRuntimeExecutor>(config)
}),
ChainIdentity::Pendulum => runner.sync_run(|config| {
cmd.run::<Block, PendulumRuntimeExecutor>(config)
}),
ChainIdentity::Development => runner.sync_run(|config| {
cmd.run::<Block, DevelopmentRuntimeExecutor>(config)
}),
}
} else {
Err("Benchmarking wasn't enabled when building the node. \
You can enable it with `--features runtime-benchmarks`."
.into())
},
(BenchmarkCmd::Block(cmd), runtime) => match runtime {
ChainIdentity::Amplitude => runner.sync_run(|config| {
let partials = new_partial::<
amplitude_runtime::RuntimeApi,
AmplitudeRuntimeExecutor,
>(&config)?;
cmd.run(partials.client)
}),
ChainIdentity::Foucoco => runner.sync_run(|config| {
let partials = new_partial::<
foucoco_runtime::RuntimeApi,
FoucocoRuntimeExecutor,
>(&config)?;
cmd.run(partials.client)
}),
ChainIdentity::Pendulum => runner.sync_run(|config| {
let partials = new_partial::<
pendulum_runtime::RuntimeApi,
PendulumRuntimeExecutor,
>(&config)?;
cmd.run(partials.client)
}),
ChainIdentity::Development => runner.sync_run(|config| {
let partials = new_partial::<
development_runtime::RuntimeApi,
DevelopmentRuntimeExecutor,
>(&config)?;
cmd.run(partials.client)
}),
},
#[cfg(not(feature = "runtime-benchmarks"))]
(BenchmarkCmd::Storage(_), _) =>
return Err(sc_cli::Error::Input(
"Compile with --features=runtime-benchmarks \
Some(Subcommand::Benchmark(bench_cmd)) => match bench_cmd {
BenchmarkCmd::Pallet(cmd) => {
if cfg!(feature = "runtime-benchmarks") {
let runner = cli.create_runner(cmd)?;

match runner.config().chain_spec.identify() {
ChainIdentity::Amplitude => runner.sync_run(|config| {
cmd.run::<Block, AmplitudeRuntimeExecutor>(config)
}),
ChainIdentity::Foucoco => runner.sync_run(|config| {
cmd.run::<Block, FoucocoRuntimeExecutor>(config)
}),
ChainIdentity::Pendulum => runner.sync_run(|config| {
cmd.run::<Block, PendulumRuntimeExecutor>(config)
}),
ChainIdentity::Development => runner.sync_run(|config| {
cmd.run::<Block, DevelopmentRuntimeExecutor>(config)
}),
}
} else {
Err("Benchmarking wasn't enabled when building the node. \
You can enable it with `--features runtime-benchmarks`."
.into())
}
},
BenchmarkCmd::Block(cmd) => {
construct_sync_run!(|components, cli, cmd, config| {
cmd.run(components.client)
})
},
#[cfg(not(feature = "runtime-benchmarks"))]
BenchmarkCmd::Storage(_) =>
return Err(sc_cli::Error::Input(
"Compile with --features=runtime-benchmarks \
to enable storage benchmarks."
.into(),
)
.into(),
)
.into()),
#[cfg(feature = "runtime-benchmarks")]
(BenchmarkCmd::Storage(cmd), runtime) => match runtime {
ChainIdentity::Amplitude => runner.sync_run(|config| {
let partials = new_partial::<
amplitude_runtime::RuntimeApi,
AmplitudeRuntimeExecutor,
>(&config)?;
let db = partials.backend.expose_db();
let storage = partials.backend.expose_storage();

cmd.run(config, partials.client.clone(), db, storage)
}),
ChainIdentity::Foucoco => runner.sync_run(|config| {
let partials = new_partial::<
foucoco_runtime::RuntimeApi,
FoucocoRuntimeExecutor,
>(&config)?;
let db = partials.backend.expose_db();
let storage = partials.backend.expose_storage();

cmd.run(config, partials.client.clone(), db, storage)
}),
ChainIdentity::Pendulum => runner.sync_run(|config| {
let partials = new_partial::<
pendulum_runtime::RuntimeApi,
PendulumRuntimeExecutor,
>(&config)?;
let db = partials.backend.expose_db();
let storage = partials.backend.expose_storage();

cmd.run(config, partials.client.clone(), db, storage)
}),
ChainIdentity::Development => runner.sync_run(|config| {
let partials = new_partial::<
development_runtime::RuntimeApi,
DevelopmentRuntimeExecutor,
>(&config)?;
let db = partials.backend.expose_db();
let storage = partials.backend.expose_storage();

cmd.run(config, partials.client.clone(), db, storage)
}),
},
(BenchmarkCmd::Machine(cmd), _) =>
runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone())),
// NOTE: this allows the Client to leniently implement
// new benchmark commands without requiring a companion MR.
#[allow(unreachable_patterns)]
_ => Err("Benchmarking sub-command unsupported".into()),
#[cfg(feature = "runtime-benchmarks")]
BenchmarkCmd::Storage(cmd) => {
construct_sync_run!(|components, cli, cmd, config| {
let db = components.backend.expose_db();
let storage = components.backend.expose_storage();

cmd.run(config, components.client.clone(), db, storage)
})
}
},
BenchmarkCmd::Machine(cmd) => {
let runner = cli.create_runner(cmd)?;
runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()))
},
// NOTE: this allows the Client to leniently implement
// new benchmark commands without requiring a companion MR.
#[allow(unreachable_patterns)]
_ => Err("Benchmarking sub-command unsupported".into()),
}
#[cfg(feature = "try-runtime")]
Some(Subcommand::TryRuntime(cmd)) => {
if cfg!(feature = "try-runtime") {
Expand Down
4 changes: 2 additions & 2 deletions runtime/amplitude/src/xcm_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ impl xcm_executor::Config for XcmConfig {
type AssetClaims = PolkadotXcm;
type SubscriptionService = PolkadotXcm;
type PalletInstancesInfo = crate::AllPalletsWithSystem;
type MaxAssetsIntoHolding = ();
type MaxAssetsIntoHolding = ConstU32<8>;
type FeeManager = ();
type MessageExporter = ();
type UniversalAliases = Nothing;
Expand Down Expand Up @@ -280,7 +280,7 @@ impl pallet_xcm::Config for Runtime {
// ^ Override for AdvertisedXcmVersion default
type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
type TrustedLockers = ();
type SovereignAccountOf = ();
type SovereignAccountOf = LocationToAccountId;
type MaxLockers = ConstU32<8>;
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")]
Expand Down
1 change: 0 additions & 1 deletion runtime/development/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ runtime-benchmarks = [
"xcm-builder/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",

]

try-runtime = [
Expand Down
6 changes: 3 additions & 3 deletions runtime/development/src/xcm_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ impl xcm_executor::Config for XcmConfig {
type AssetClaims = PolkadotXcm;
type SubscriptionService = PolkadotXcm;
type PalletInstancesInfo = AllPalletsWithSystem;
type MaxAssetsIntoHolding = ();
type MaxAssetsIntoHolding = ConstU32<8>;
type FeeManager = ();
type MessageExporter = ();
type UniversalAliases = Nothing;
Expand Down Expand Up @@ -230,8 +230,8 @@ impl pallet_xcm::Config for Runtime {
// ^ Override for AdvertisedXcmVersion default
type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
type TrustedLockers = ();
type SovereignAccountOf = ();
type MaxLockers = ConstU32<0>;
type SovereignAccountOf = LocationToAccountId;
type MaxLockers = ConstU32<8>;
type WeightInfo = pallet_xcm::TestWeightInfo;
#[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest;
Expand Down
4 changes: 2 additions & 2 deletions runtime/foucoco/src/xcm_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ impl xcm_executor::Config for XcmConfig {
type AssetClaims = PolkadotXcm;
type SubscriptionService = PolkadotXcm;
type PalletInstancesInfo = crate::AllPalletsWithSystem;
type MaxAssetsIntoHolding = ();
type MaxAssetsIntoHolding = ConstU32<8>;
type FeeManager = ();
type MessageExporter = ();
type UniversalAliases = Nothing;
Expand Down Expand Up @@ -317,7 +317,7 @@ impl pallet_xcm::Config for Runtime {
// ^ Override for AdvertisedXcmVersion default
type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
type TrustedLockers = ();
type SovereignAccountOf = ();
type SovereignAccountOf = LocationToAccountId;
type MaxLockers = ConstU32<8>;
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")]
Expand Down
1 change: 0 additions & 1 deletion runtime/integration-tests/pendulum/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#[cfg(test)]
mod polkadot_test_net;

Expand Down
4 changes: 2 additions & 2 deletions runtime/pendulum/src/xcm_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ impl xcm_executor::Config for XcmConfig {
type AssetClaims = PolkadotXcm;
type SubscriptionService = PolkadotXcm;
type PalletInstancesInfo = crate::AllPalletsWithSystem;
type MaxAssetsIntoHolding = ConstU32<64>;
type MaxAssetsIntoHolding = ConstU32<8>;
type FeeManager = ();
type MessageExporter = ();
type UniversalAliases = Nothing;
Expand Down Expand Up @@ -320,7 +320,7 @@ impl pallet_xcm::Config for Runtime {
// ^ Override for AdvertisedXcmVersion default
type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
type TrustedLockers = ();
type SovereignAccountOf = ();
type SovereignAccountOf = LocationToAccountId;
type MaxLockers = ConstU32<8>;
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")]
Expand Down

0 comments on commit 229af34

Please sign in to comment.