Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Update futures and tokio for browser light client #673

Merged
expenses merged 58 commits into from
Dec 10, 2019
Merged

Update futures and tokio for browser light client #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
20104e9
Make availability-store compile for WASM
tomaka Nov 28, 2019
6f97dbb
Use --manifest-path instead
tomaka Nov 28, 2019
db7eaa6
Merge branch 'master' into wasm-start
tomaka Nov 28, 2019
b45a95c
Merge remote-tracking branch 'tomaka/wasm-start' into HEAD
expenses Nov 29, 2019
cceb6b7
Make validation work on wasm!
expenses Nov 29, 2019
2ab282f
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Nov 29, 2019
aaf5e55
Switch to Spawn trait
expenses Nov 29, 2019
96f1a99
Migrate validation to std futures
expenses Nov 29, 2019
322cca5
Migrate network to std futures
expenses Nov 29, 2019
1c9cf04
Final changes to validation
expenses Nov 30, 2019
7356325
Tidy up network
expenses Nov 30, 2019
0c4fe83
Tidy up validation
expenses Nov 30, 2019
93fb642
Switch branch
expenses Dec 1, 2019
119f082
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 1, 2019
04ffe72
Migrate service
expenses Dec 1, 2019
408288b
Get polkadot to compile via wasm!
expenses Dec 1, 2019
e5e399c
Add browser-demo
expenses Dec 2, 2019
868f6e5
Add initial browser file
expenses Dec 2, 2019
5b33b7a
Add browser-demo
expenses Dec 2, 2019
31a88a9
Tidy
expenses Dec 2, 2019
a03a980
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 2, 2019
af88a87
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 2, 2019
4e1da88
Temp switch back to substrate/master
expenses Dec 3, 2019
832f805
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 4, 2019
da233a1
tidy
expenses Dec 4, 2019
c528dc6
Fix wasm build
expenses Dec 4, 2019
9767f83
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 4, 2019
6adc1b6
Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm
expenses Dec 6, 2019
2e2311e
Re-add release flag
expenses Dec 6, 2019
0c5f24e
Switch to polkadot-master
expenses Dec 9, 2019
d2de6d8
Revert cli tokio version to avoid libp2p panic
expenses Dec 9, 2019
112344f
Update tokio version
expenses Dec 9, 2019
a820612
Fix availability store tests
expenses Dec 9, 2019
5729f6c
Fix validation tests
expenses Dec 9, 2019
4e458f7
Remove futures01 from availability-store
expenses Dec 9, 2019
e1338cb
Fix network tests
expenses Dec 9, 2019
6c4ff5b
Small changes
expenses Dec 9, 2019
fc02b1d
Fix collator
expenses Dec 9, 2019
5bcb83a
Fix typo
expenses Dec 9, 2019
cfeb50c
Revert removal of tokio_executor that causes tokio version mismatch p…
expenses Dec 9, 2019
f92f580
Fix adder test parachain
expenses Dec 9, 2019
938f411
Revert "Revert removal of tokio_executor that causes tokio version mi…
expenses Dec 9, 2019
ec73672
Update availability-store/src/worker.rs
expenses Dec 9, 2019
d8be456
Update network/src/lib.rs
expenses Dec 9, 2019
08bfdf7
Update network/src/lib.rs
expenses Dec 9, 2019
2e8b05e
Box pin changes
expenses Dec 9, 2019
b22758d
Merge remote-tracking branch 'parity/master' into ashley-futures-updates
expenses Dec 9, 2019
f20ae65
Asyncify network functions
expenses Dec 9, 2019
60e7211
Clean up browser validation worker error
expenses Dec 9, 2019
f0c517e
Merge branch 'ashley-futures-updates' into ashley-futures-update
expenses Dec 9, 2019
33410f3
Fix av store test
expenses Dec 9, 2019
8bb6a01
Nits
expenses Dec 9, 2019
0c5c140
Fix validation test
expenses Dec 9, 2019
47e002b
Switch favicon
expenses Dec 9, 2019
8241355
Fix validation test again
expenses Dec 9, 2019
7fa88af
Revert "Asyncify network functions"
expenses Dec 9, 2019
f98966a
Add async blocks back in
expenses Dec 9, 2019
970e485
Merge remote-tracking branch 'parity/master' into ashley-futures-update
expenses Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 35 additions & 34 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions availability-store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ polkadot-runtime = { path = "../runtime" }
parking_lot = "0.9.0"
derive_more = "0.99"
log = "0.4.8"
futures01 = "0.1.17"
futures = { package = "futures", version = "0.3.1", features = ["compat"] }
tokio = "0.1.7"
futures = "0.3.1"
tokio = { version = "0.2.4", features = ["rt-core"] }
exit-future = "0.2.0"
codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
Expand Down
12 changes: 5 additions & 7 deletions availability-store/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#![warn(missing_docs)]

use futures::prelude::*;
use futures::channel::{mpsc, oneshot};
use futures::{channel::{mpsc, oneshot}, task::Spawn};
use keystore::KeyStorePtr;
use polkadot_primitives::{
Hash, Block,
Expand All @@ -38,7 +38,7 @@ use client::{
BlockchainEvents, BlockBody,
};
use sp_api::ApiExt;

use std::pin::Pin;
use log::warn;

use std::sync::Arc;
Expand All @@ -58,10 +58,7 @@ use worker::{
use store::{Store as InnerStore};

/// Abstraction over an executor that lets you spawn tasks in the background.
pub(crate) type TaskExecutor =
Arc<dyn futures01::future::Executor<
Box<dyn futures01::Future<Item = (), Error = ()> + Send>
> + Send + Sync>;
pub(crate) type TaskExecutor = Arc<dyn Spawn + Send + Sync>;

const LOG_TARGET: &str = "availability";

Expand Down Expand Up @@ -110,7 +107,7 @@ pub trait ProvideGossipMessages {
fn gossip_messages_for(
&self,
topic: Hash,
) -> Box<dyn Stream<Item = (Hash, Hash, ErasureChunk)> + Send + Unpin>;
) -> Pin<Box<dyn Stream<Item = (Hash, Hash, ErasureChunk)> + Send>>;

/// Gossip an erasure chunk message.
fn gossip_erasure_chunk(
Expand Down Expand Up @@ -155,6 +152,7 @@ impl Store {
///
/// Creating a store among other things starts a background worker thread which
/// handles most of the write operations to the storage.
#[cfg(not(target_os = "unknown"))]
pub fn new<PGM>(config: Config, gossip: PGM) -> io::Result<Self>
where PGM: ProvideGossipMessages + Send + Sync + Clone + 'static
{
Expand Down
2 changes: 2 additions & 0 deletions availability-store/src/store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.

#[cfg(not(target_os = "unknown"))]
use kvdb_rocksdb::{Database, DatabaseConfig};
use kvdb::{KeyValueDB, DBTransaction};
use codec::{Encode, Decode};
Expand Down Expand Up @@ -82,6 +83,7 @@ fn erasure_roots_in_relay_chain_block_key(relay_block: &Hash) -> Vec<u8> {

impl Store {
/// Create a new `Store` with given condig on disk.
#[cfg(not(target_os = "unknown"))]
pub(super) fn new(config: Config) -> io::Result<Self> {
let mut db_config = DatabaseConfig::with_columns(Some(columns::NUM_COLUMNS));

Expand Down
Loading