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

Dependency not needed #1738

Closed
wants to merge 2 commits into from
Closed

Dependency not needed #1738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d017bb1
Avoid pulling in polkadot-cli
gilescope Oct 6, 2022
2cbd5d6
Incorporating PR feedback
gilescope Oct 6, 2022
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
3 changes: 1 addition & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions client/relay-chain-inprocess-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ futures = "0.3.24"
futures-timer = "3.0.2"

# Substrate
sc-cli = { git = "https:/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https:/paritytech/substrate", branch = "master" }
sc-telemetry = { git = "https:/paritytech/substrate", branch = "master" }
sc-tracing = { git = "https:/paritytech/substrate", branch = "master" }
Expand All @@ -22,7 +21,6 @@ sp-runtime = { git = "https:/paritytech/substrate", branch = "master
sp-state-machine = { git = "https:/paritytech/substrate", branch = "master" }

# Polkadot
polkadot-cli = { git = "https:/paritytech/polkadot", branch = "master", default-features = false, features = ["cli"] }
polkadot-client = { git = "https:/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https:/paritytech/polkadot", branch = "master" }

Expand All @@ -38,3 +36,6 @@ sp-keyring = { git = "https:/paritytech/substrate", branch = "master
# Polkadot
polkadot-primitives = { git = "https:/paritytech/polkadot", branch = "master" }
polkadot-test-client = { git = "https:/paritytech/polkadot", branch = "master" }

[build-dependencies]
substrate-build-script-utils = { git = "https:/paritytech/substrate", branch = "master" }
7 changes: 7 additions & 0 deletions client/relay-chain-inprocess-interface/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};

fn main() {
generate_cargo_keys();

rerun_if_git_head_changed();
}
5 changes: 2 additions & 3 deletions client/relay-chain-inprocess-interface/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ use polkadot_client::{ClientHandle, ExecuteWithClient, FullBackend};
use polkadot_service::{
AuxStore, BabeApi, CollatorPair, Configuration, Handle, NewFull, TaskManager,
};
use sc_cli::SubstrateCli;
use sc_client_api::{
blockchain::BlockStatus, Backend, BlockchainEvents, HeaderBackend, ImportNotifications,
StorageProof, UsageProvider,
Expand Down Expand Up @@ -363,8 +362,8 @@ pub fn build_inprocess_relay_chain(
) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option<CollatorPair>)> {
// This is essentially a hack, but we want to ensure that we send the correct node version
bkontur marked this conversation as resolved.
Show resolved Hide resolved
// to the telemetry.
polkadot_config.impl_version = polkadot_cli::Cli::impl_version();
polkadot_config.impl_name = polkadot_cli::Cli::impl_name();
polkadot_config.impl_version = "Parity Polkadot".to_string();
polkadot_config.impl_name = env!("SUBSTRATE_CLI_IMPL_VERSION").into();

let (full_node, collator_key) = build_polkadot_full_node(
polkadot_config,
Expand Down