pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 07:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

all tests compile

Browse Source
This commit is contained in:
Robert Habermeier
2018-11-02 18:17:57 +01:00
parent 21f291a607
commit ebeacee7d4
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/consensus/aura/src/lib.rs
+4 -4
View File
@@ -404,11 +404,11 @@ pub type AuraImportQueue<B, C> = BasicQueue<B, AuraVerifier<C>>;
/// Start an import queue for the Aura consensus algorithm. /// Start an import queue for the Aura consensus algorithm.
pub fn import_queue<B, C>(config: Config, client: Arc<C>) -> AuraImportQueue<B, C> where pub fn import_queue<B, C>(config: Config, client: Arc<C>) -> AuraImportQueue<B, C> where
B: Block, B: Block,
C: Authorities<B> + BlockImport<B> + Send + Sync, C: Authorities<B> + BlockImport<B,Error=client::error::Error> + Send + Sync,
DigestItemFor<B>: CompatibleDigestItem, DigestItemFor<B>: CompatibleDigestItem,
{ {
let verifier = Arc::new(AuraVerifier { config, client }); let verifier = Arc::new(AuraVerifier { config, client: client.clone() });
BasicQueue::new(verifier) BasicQueue::new(verifier, client)
} }
@@ -458,7 +458,7 @@ mod tests {
const TEST_ROUTING_INTERVAL: Duration = Duration::from_millis(50); const TEST_ROUTING_INTERVAL: Duration = Duration::from_millis(50);
pub struct AuraTestNet { pub struct AuraTestNet {
peers: Vec<Arc<Peer<AuraVerifier<PeersClient>>>>, peers: Vec<Arc<Peer<AuraVerifier<PeersClient>, ()>>>,
started: bool started: bool
} }
substrate/core/network/src/import_queue.rs
+1 -3
View File
@@ -652,7 +652,6 @@ pub mod tests {
use super::*; use super::*;
struct TestLink { struct TestLink {
chain: Arc<Client<Block>>,
imported: Cell<usize>, imported: Cell<usize>,
maintains: Cell<usize>, maintains: Cell<usize>,
disconnects: Cell<usize>, disconnects: Cell<usize>,
@@ -662,7 +661,6 @@ pub mod tests {
impl TestLink { impl TestLink {
fn new() -> TestLink { fn new() -> TestLink {
TestLink { TestLink {
chain: Arc::new(test_client::new()),
imported: Cell::new(0), imported: Cell::new(0),
maintains: Cell::new(0), maintains: Cell::new(0),
disconnects: Cell::new(0), disconnects: Cell::new(0),
@@ -806,7 +804,7 @@ pub mod tests {
#[test] #[test]
fn async_import_queue_drops() { fn async_import_queue_drops() {
let verifier = Arc::new(PassThroughVerifier(true)); let verifier = Arc::new(PassThroughVerifier(true));
let queue = BasicQueue::new(verifier); let queue = BasicQueue::new(verifier, Arc::new(test_client::new()));
queue.start(TestLink::new()).unwrap(); queue.start(TestLink::new()).unwrap();
drop(queue); drop(queue);
} }
substrate/core/network/src/test/sync.rs
+1 -1
View File
@@ -94,7 +94,7 @@ fn own_blocks_are_announced() {
::env_logger::init().ok(); ::env_logger::init().ok();
let mut net = TestNet::new(3); let mut net = TestNet::new(3);
net.sync(); // connect'em net.sync(); // connect'em
net.peer(0).generate_blocks(1, BlockOrigin::Own, |_| ()); net.peer(0).generate_blocks(1, BlockOrigin::Own, |builder| builder.bake().unwrap());
net.sync(); net.sync();
assert_eq!(net.peer(0).client.backend().blockchain().info().unwrap().best_number, 1); assert_eq!(net.peer(0).client.backend().blockchain().info().unwrap().best_number, 1);
assert_eq!(net.peer(1).client.backend().blockchain().info().unwrap().best_number, 1); assert_eq!(net.peer(1).client.backend().blockchain().info().unwrap().best_number, 1);
substrate/core/service/src/chain_ops.rs
+3 -7
View File
@@ -88,16 +88,12 @@ pub fn export_blocks<F, E, W>(config: FactoryFullConfiguration<F>, exit: E, mut
pub fn import_blocks<F, E, R>(config: FactoryFullConfiguration<F>, exit: E, mut input: R) -> error::Result<()> pub fn import_blocks<F, E, R>(config: FactoryFullConfiguration<F>, exit: E, mut input: R) -> error::Result<()>
where F: ServiceFactory, E: Future<Item=(),Error=()> + Send + 'static, R: Read, where F: ServiceFactory, E: Future<Item=(),Error=()> + Send + 'static, R: Read,
{ {
use network::ClientHandle; struct DummyLink;
impl<B: Block> Link<B> for DummyLink { }
struct DummyLink<T>(::std::sync::Arc<T>);
impl<B: Block, T: ClientHandle<B>> Link<B> for DummyLink<T> {
fn chain(&self) -> &ClientHandle<B> { &*self.0 }
}
let client = new_client::<F>(&config)?; let client = new_client::<F>(&config)?;
let queue = components::FullComponents::<F>::build_import_queue(&config, client.clone())?; let queue = components::FullComponents::<F>::build_import_queue(&config, client.clone())?;
queue.start(DummyLink(client.clone()))?; queue.start(DummyLink)?;
let (exit_send, exit_recv) = std::sync::mpsc::channel(); let (exit_send, exit_recv) = std::sync::mpsc::channel();
::std::thread::spawn(move || { ::std::thread::spawn(move || {