From 44696f46c31ccb34049f767350113dbdcb82cb81 Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <JoshOrndorff@users.noreply.github.com>
Date: Fri, 25 Oct 2019 00:25:33 -0400
Subject: [PATCH] Change dependency name "node-template-runtime" -> "runtime"
(#3910)
---
substrate/node-template/Cargo.toml | 2 +-
substrate/node-template/src/chain_spec.rs | 2 +-
substrate/node-template/src/service.rs | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/substrate/node-template/Cargo.toml b/substrate/node-template/Cargo.toml
index 2c01655dc2e..bb61c2c2ca7 100644
--- a/substrate/node-template/Cargo.toml
+++ b/substrate/node-template/Cargo.toml
@@ -33,7 +33,7 @@ grandpa = { package = "substrate-finality-grandpa", path = "../core/finality-gra
grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../core/finality-grandpa/primitives" }
substrate-client = { path = "../core/client" }
basic-authorship = { package = "substrate-basic-authorship", path = "../core/basic-authorship" }
-node-template-runtime = { path = "runtime" }
+runtime = { package = "node-template-runtime", path = "runtime" }
[build-dependencies]
vergen = "3.0.4"
diff --git a/substrate/node-template/src/chain_spec.rs b/substrate/node-template/src/chain_spec.rs
index 2996f5414a5..b8f7fef35e8 100644
--- a/substrate/node-template/src/chain_spec.rs
+++ b/substrate/node-template/src/chain_spec.rs
@@ -1,5 +1,5 @@
use primitives::{Pair, Public};
-use node_template_runtime::{
+use runtime::{
AccountId, AuraConfig, BalancesConfig, GenesisConfig, GrandpaConfig,
SudoConfig, IndicesConfig, SystemConfig, WASM_BINARY,
};
diff --git a/substrate/node-template/src/service.rs b/substrate/node-template/src/service.rs
index 46c0124cb40..203e311df9d 100644
--- a/substrate/node-template/src/service.rs
+++ b/substrate/node-template/src/service.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
use std::time::Duration;
use substrate_client::LongestChain;
use futures::prelude::*;
-use node_template_runtime::{self, GenesisConfig, opaque::Block, RuntimeApi};
+use runtime::{self, GenesisConfig, opaque::Block, RuntimeApi};
use substrate_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder};
use transaction_pool::{self, txpool::{Pool as TransactionPool}};
use inherents::InherentDataProviders;
@@ -17,8 +17,8 @@ use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
// Our native executor instance.
native_executor_instance!(
pub Executor,
- node_template_runtime::api::dispatch,
- node_template_runtime::native_version,
+ runtime::api::dispatch,
+ runtime::native_version,
);
construct_simple_protocol! {
@@ -36,7 +36,7 @@ macro_rules! new_full_start {
let inherent_data_providers = inherents::InherentDataProviders::new();
let builder = substrate_service::ServiceBuilder::new_full::<
- node_template_runtime::opaque::Block, node_template_runtime::RuntimeApi, crate::service::Executor
+ runtime::opaque::Block, runtime::RuntimeApi, crate::service::Executor
>($config)?
.with_select_chain(|_config, backend| {
Ok(substrate_client::LongestChain::new(backend.clone()))
@@ -49,7 +49,7 @@ macro_rules! new_full_start {
.ok_or_else(|| substrate_service::Error::SelectChainRequired)?;
let (grandpa_block_import, grandpa_link) =
- grandpa::block_import::<_, _, _, node_template_runtime::RuntimeApi, _, _>(
+ grandpa::block_import::<_, _, _, runtime::RuntimeApi, _, _>(
client.clone(), &*client, select_chain
)?;
--
GitLab