Update futures and tokio for browser light client (#673)

* Make availability-store compile for WASM * Use --manifest-path instead * Make validation work on wasm! * Switch to Spawn trait * Migrate validation to std futures * Migrate network to std futures * Final changes to validation * Tidy up network * Tidy up validation * Switch branch * Migrate service * Get polkadot to compile via wasm! * Add browser-demo * Add initial browser file * Add browser-demo * Tidy * Temp switch back to substrate/master * tidy * Fix wasm build * Re-add release flag * Switch to polkadot-master * Revert cli tokio version to avoid libp2p panic * Update tokio version * Fix availability store tests * Fix validation tests * Remove futures01 from availability-store * Fix network tests * Small changes * Fix collator * Fix typo * Revert removal of tokio_executor that causes tokio version mismatch panic * Fix adder test parachain * Revert "Revert removal of tokio_executor that causes tokio version mismatch panic" This reverts commit cfeb50c01d8df5e209483406a711e64761b44ae9. * Update availability-store/src/worker.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Update network/src/lib.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Update network/src/lib.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Box pin changes * Asyncify network functions * Clean up browser validation worker error * Fix av store test * Nits * Fix validation test * Switch favicon * Fix validation test again * Revert "Asyncify network functions" This reverts commit f20ae6548dc482cb1e75bc80641cfe55c6131a53. * Add async blocks back in
2026-07-18 02:25:41 +00:00 · 2019-12-10 11:58:22 +01:00
parent df3ea965e7
commit 25aa988f9b
34 changed files with 826 additions and 444 deletions
@@ -32,6 +32,8 @@ use parachain::{wasm_executor::{self, ExternalitiesError, ExecutionMode}, Messag
 use trie::TrieConfiguration;
 use futures::prelude::*;
 use log::debug;
+use std::task::{Poll, Context};
+use std::pin::Pin;

 /// Encapsulates connections to collators and allows collation on any parachain.
 ///
@@ -40,7 +42,7 @@ pub trait Collators: Clone {
 	/// Errors when producing collations.
 	type Error: std::fmt::Debug;
 	/// A full collation.
-	type Collation: IntoFuture<Item=Collation,Error=Self::Error>;
+	type Collation: Future<Output=Result<Collation, Self::Error>>;

 	/// Collate on a specific parachain, building on a given relay chain parent hash.
 	///
@@ -63,7 +65,7 @@ pub struct CollationFetch<C: Collators, P> {
 	relay_parent_hash: Hash,
 	relay_parent: BlockId,
 	collators: C,
-	live_fetch: Option<<C::Collation as IntoFuture>::Future>,
+	live_fetch: Option<C::Collation>,
 	client: Arc<P>,
 	max_block_data_size: Option<u64>,
 }
@@ -99,41 +101,50 @@ impl<C: Collators, P> CollationFetch<C, P> {
 	}
 }

-impl<C: Collators, P: ProvideRuntimeApi> Future for CollationFetch<C, P>
-	where P::Api: ParachainHost<Block, Error = sp_blockchain::Error>,
+impl<C, P> Future for CollationFetch<C, P>
+	where
+		P::Api: ParachainHost<Block, Error = sp_blockchain::Error>,
+		C: Collators + Unpin,
+		P: ProvideRuntimeApi,
+		<C as Collators>::Collation: Unpin,
 {
-	type Item = (Collation, OutgoingMessages, Balance);
-	type Error = C::Error;
+	type Output = Result<(Collation, OutgoingMessages, Balance),C::Error>;
+
+	fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
+		let this = Pin::into_inner(self);

-	fn poll(&mut self) -> Poll<(Collation, OutgoingMessages, Balance), C::Error> {
 		loop {
 			let collation = {
-				let parachain = self.parachain.clone();
-				let (r, c)  = (self.relay_parent_hash, &self.collators);
-				let poll = self.live_fetch
-					.get_or_insert_with(move || c.collate(parachain, r).into_future())
-					.poll();
+				let parachain = this.parachain.clone();
+				let (r, c)  = (this.relay_parent_hash, &this.collators);

-				futures::try_ready!(poll)
+				let future = this.live_fetch
+					.get_or_insert_with(move || c.collate(parachain, r));
+
+				match Pin::new(future).poll(cx) {
+					Poll::Ready(Ok(c)) => c,
+					Poll::Ready(Err(err)) => return Poll::Ready(Err(err)),
+					Poll::Pending => return Poll::Pending
+				}
 			};

 			let res = validate_collation(
-				&*self.client,
-				&self.relay_parent,
+				&*this.client,
+				&this.relay_parent,
 				&collation,
-				self.max_block_data_size,
+				this.max_block_data_size,
 			);

 			match res {
 				Ok((messages, fees)) => {
-					return Ok(Async::Ready((collation, messages, fees)))
+					return Poll::Ready(Ok((collation, messages, fees)))
 				}
 				Err(e) => {
 					debug!("Failed to validate parachain due to API error: {}", e);

 					// just continue if we got a bad collation or failed to validate
-					self.live_fetch = None;
-					self.collators.note_bad_collator(collation.info.collator)
+					this.live_fetch = None;
+					this.collators.note_bad_collator(collation.info.collator)
 				}
 			}
 		}