Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Companion for paritytech/polkadot#6744: Retire OldV1SessionInfo #2213

Merged
merged 22 commits into from
Feb 20, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0ea7ea6
Adjust commands
pmikolajczyk41 Jan 17, 2023
f85fa08
Use `NetworkWorker::next_action()` instead of `poll()`
dmitry-markin Jan 23, 2023
7816cf5
rustfmt
dmitry-markin Jan 23, 2023
5fb62ad
minor: fix mutability
dmitry-markin Jan 23, 2023
e8d6b05
Move imports
pmikolajczyk41 Feb 2, 2023
4d230d1
Replace `NetworkWorker::next_action()` with `run()`
dmitry-markin Feb 6, 2023
8de462c
Merge remote-tracking branch 'origin/master' into dm-network-service-…
dmitry-markin Feb 6, 2023
117d0ba
Merge remote-tracking branch 'origin/master' into dm-network-service-…
dmitry-markin Feb 8, 2023
4914bc8
Merge remote-tracking branch 'origin/master' into piomiko/try-runtime…
pmikolajczyk41 Feb 13, 2023
301c4f6
Import fix
pmikolajczyk41 Feb 13, 2023
949ab4c
Make `NetworkWorker::run` consume self
dmitry-markin Feb 15, 2023
03d2053
Merge remote-tracking branch 'origin/master' into dm-network-service-…
dmitry-markin Feb 15, 2023
d536ef1
Merge remote-tracking branch 'origin/master' into piomiko/try-runtime…
pmikolajczyk41 Feb 15, 2023
0141497
Merge remote-tracking branch 'origin/master' into piomiko/try-runtime…
pmikolajczyk41 Feb 17, 2023
79d4e91
Retire `OldV1SessionInfo`
s0me0ne-unkn0wn Feb 19, 2023
bc76511
update lockfile for {"polkadot", "substrate"}
Feb 20, 2023
9987754
Merge remote-tracking branch 'origin/master' into dm-network-service-…
Feb 20, 2023
22dd46a
update lockfile for {"substrate", "polkadot"}
Feb 20, 2023
5a6a472
Merge remote-tracking branch 'origin/dm-network-service-async-await' …
ggwpez Feb 20, 2023
f791db6
update lockfile for {"substrate", "polkadot"}
Feb 20, 2023
01c521a
Merge remote-tracking branch 'pmi/piomiko/try-runtime/fast-forward' i…
ggwpez Feb 20, 2023
755e9da
Make stuff compile
ggwpez Feb 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move imports
  • Loading branch information
pmikolajczyk41 committed Feb 2, 2023
commit e8d6b05de4cae393c1fbf02fe981605795222df0
7 changes: 3 additions & 4 deletions parachain-template/node/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ use sc_service::config::{BasePath, PrometheusConfig};
use sp_core::hexdisplay::HexDisplay;
use sp_runtime::traits::{AccountIdConversion, Block as BlockT};

#[cfg(feature = "try-runtime")]
use try_runtime_cli::block_building_info::timestamp_with_aura_info;

use crate::{
chain_spec,
cli::{Cli, RelayChainCli, Subcommand},
Expand Down Expand Up @@ -232,9 +229,11 @@ pub fn run() -> Result<()> {
},
#[cfg(feature = "try-runtime")]
Some(Subcommand::TryRuntime(cmd)) => {
use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
use try_runtime_cli::block_building_info::timestamp_with_aura_info;

let runner = cli.create_runner(cmd)?;

use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
type HostFunctionsOf<E> = ExtendedHostFunctions<
sp_io::SubstrateHostFunctions,
<E as NativeExecutionDispatch>::ExtendHostFunctions,
Expand Down
7 changes: 3 additions & 4 deletions polkadot-parachain/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ use sp_core::hexdisplay::HexDisplay;
use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
use std::{net::SocketAddr, path::PathBuf};

#[cfg(feature = "try-runtime")]
use try_runtime_cli::block_building_info::timestamp_with_aura_info;

/// Helper enum that is used for better distinction of different parachain/runtime configuration
/// (it is based/calculated on ChainSpec's ID attribute)
#[derive(Debug, PartialEq, Default)]
Expand Down Expand Up @@ -690,13 +687,15 @@ pub fn run() -> Result<()> {
},
#[cfg(feature = "try-runtime")]
Some(Subcommand::TryRuntime(cmd)) => {
use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
use try_runtime_cli::block_building_info::timestamp_with_aura_info;

// grab the task manager.
let runner = cli.create_runner(cmd)?;
let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry);
let task_manager =
sc_service::TaskManager::new(runner.config().tokio_handle.clone(), *registry)
.map_err(|e| format!("Error: {:?}", e))?;
use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
type HostFunctionsOf<E> = ExtendedHostFunctions<
sp_io::SubstrateHostFunctions,
<E as NativeExecutionDispatch>::ExtendHostFunctions,
Expand Down