pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-11 15:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expunge error-chain (feat. tomaka) (#2662)

Browse Source 
* Remove error_chain

* Expunge error-chain from rpc and service.

* Expunge from transaction pool.

* Expunge from node/cli

* Expunge from keystore.

* Remove some boilerplate.

* Fix remaining stuff.

* Improve on deprecation message.

* Fix issues.

* Fix trnsaction pool tests.

* Fix the rest.

* Fix borked merge.

* Update lock
This commit is contained in:
Tomasz Drwięga
2019-05-24 11:35:31 +02:00
committed by Gavin Wood
parent 69ffec5822
commit c162fc5ff1
68 changed files with 951 additions and 1158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/node-template/src/error.rs
-13
View File
@@ -1,13 +0,0 @@
//! Initialization errors.
use client;
error_chain! {
foreign_links {
Io(::std::io::Error) #[doc="IO error"];
Cli(::clap::Error) #[doc="CLI error"];
}
links {
Client(client::error::Error, client::error::ErrorKind) #[doc="Client error"];
}
}
substrate/node-template/src/main.rs
+6 -4
View File
@@ -9,7 +9,7 @@ mod cli;
pub use substrate_cli::{VersionInfo, IntoExit, error};
fn run() -> cli::error::Result<()> {
fn main() {
let version = VersionInfo {
name: "Substrate Node",
commit: env!("VERGEN_SHA_SHORT"),
@@ -19,7 +19,9 @@ fn run() -> cli::error::Result<()> {
description: "Template Node",
support_url: "support.anonymous.an",
};
cli::run(::std::env::args(), cli::Exit, version)
}
error_chain::quick_main!(run);
if let Err(e) = cli::run(::std::env::args(), cli::Exit, version) {
eprintln!("Error starting the node: {}\n\n{:?}", e, e);
std::process::exit(1)
}
}
substrate/node-template/src/service.rs
+14 -6
View File
@@ -10,7 +10,7 @@ use substrate_service::{
FactoryFullConfiguration, LightComponents, FullComponents, FullBackend,
FullClient, LightClient, LightBackend, FullExecutor, LightExecutor,
TaskExecutor,
error::{Error as ServiceError, ErrorKind as ServiceErrorKind},
error::{Error as ServiceError},
};
use basic_authorship::ProposerFactory;
use consensus::{import_queue, start_aura, AuraImportQueue, SlotDuration, NothingExtra};
@@ -46,10 +46,18 @@ construct_service_factory! {
RuntimeApi = RuntimeApi,
NetworkProtocol = NodeProtocol { |config| Ok(NodeProtocol::new()) },
RuntimeDispatch = Executor,
FullTransactionPoolApi = transaction_pool::ChainApi<client::Client<FullBackend<Self>, FullExecutor<Self>, Block, RuntimeApi>, Block>
{ |config, client| Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(client))) },
LightTransactionPoolApi = transaction_pool::ChainApi<client::Client<LightBackend<Self>, LightExecutor<Self>, Block, RuntimeApi>, Block>
{ |config, client| Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(client))) },
FullTransactionPoolApi = transaction_pool::ChainApi<
client::Client<FullBackend<Self>, FullExecutor<Self>, Block, RuntimeApi>,
Block
> {
|config, client| Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(client)))
},
LightTransactionPoolApi = transaction_pool::ChainApi<
client::Client<LightBackend<Self>, LightExecutor<Self>, Block, RuntimeApi>,
Block
> {
|config, client| Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(client)))
},
Genesis = GenesisConfig,
Configuration = NodeConfig,
FullService = FullComponents<Self>
@@ -67,7 +75,7 @@ construct_service_factory! {
});
let client = service.client();
let select_chain = service.select_chain()
.ok_or_else(|| ServiceError::from(ServiceErrorKind::SelectChainRequired))?;
.ok_or_else(|| ServiceError::SelectChainRequired)?;
executor.spawn(start_aura(
SlotDuration::get_or_compute(&*client)?,
key.clone(),