Protocol ID configurable in the chain spec (#811)

* Protocol ID configurable in the chain spec

* Removed obsolete const
This commit is contained in:
Arkadiy Paronyan
2018-09-27 13:26:07 +02:00
committed by Gav Wood
parent 37102611d4
commit 0ab3b2de35
6 changed files with 22 additions and 12 deletions
+3 -2
View File
@@ -120,6 +120,7 @@ pub fn staging_testnet_config() -> ChainSpec<GenesisConfig> {
staging_testnet_config_genesis,
boot_nodes,
Some(STAGING_TELEMETRY_URL.into()),
None,
)
}
@@ -214,7 +215,7 @@ fn development_config_genesis() -> GenesisConfig {
/// Development config (single validator Alice)
pub fn development_config() -> ChainSpec<GenesisConfig> {
ChainSpec::from_genesis("Development", "development", development_config_genesis, vec![], None)
ChainSpec::from_genesis("Development", "development", development_config_genesis, vec![], None, None)
}
fn local_testnet_genesis() -> GenesisConfig {
@@ -226,5 +227,5 @@ fn local_testnet_genesis() -> GenesisConfig {
/// Local testnet config (multivalidator Alice + Bob)
pub fn local_testnet_config() -> ChainSpec<GenesisConfig> {
ChainSpec::from_genesis("Local Testnet", "local_testnet", local_testnet_genesis, vec![], None)
ChainSpec::from_genesis("Local Testnet", "local_testnet", local_testnet_genesis, vec![], None, None)
}
-2
View File
@@ -102,8 +102,6 @@ impl service::ServiceFactory for Factory {
type Genesis = GenesisConfig;
type Configuration = CustomConfiguration;
const NETWORK_PROTOCOL_ID: network::ProtocolId = ::node_network::PROTOCOL_ID;
fn build_full_transaction_pool(config: TransactionPoolOptions, client: Arc<service::FullClient<Self>>)
-> Result<TransactionPool<service::FullClient<Self>>, Error>
{