display errors with their sources (#2264)

* update futures to 0.3.9

* companion changes for generic error types

* improve errors, keep error sources

* command compile fix

* use the correct Error type, add annotation

* avoid async { fut.await.map_err(E::Variant) } with TryFuture

* fix cargo lock, bump futures to 0.3.10

futures 0.3.9 got yanked

* chore cargo update -p sp-io

* minor quirk

* make rustc 1.48 happy by bouning the error more tightly

* be more explicit

* cargo lock futures
This commit is contained in:
Bernhard Schuster
2021-01-13 22:14:26 +01:00
committed by GitHub
parent ff341a7bdb
commit 1d28f59e19
4 changed files with 180 additions and 179 deletions
@@ -19,7 +19,8 @@
use polkadot_node_primitives::CollationGenerationConfig;
use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
use polkadot_primitives::v1::Id as ParaId;
use sc_cli::{Result, Error as SubstrateCliError, Role, SubstrateCli};
use polkadot_cli::{Error, Result};
use sc_cli::{Error as SubstrateCliError, Role, SubstrateCli};
use sp_core::hexdisplay::HexDisplay;
use test_parachain_adder_collator::Collator;
@@ -37,7 +38,7 @@ fn main() -> Result<()> {
let collator = Collator::new();
println!("0x{:?}", HexDisplay::from(&collator.genesis_head()));
Ok(())
Ok::<_, Error>(())
}
Some(cli::Subcommand::ExportGenesisWasm(_params)) => {
let collator = Collator::new();