mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 09:21:04 +00:00
Upgrade from futures-preview to futures 0.3.1, and remove futures 0.1 where currently possible (#4083)
* Migrate node and node-template * Migrate srml * Simple changes * Add async-std for interval * Fix test-runtime warning * Small changes * move futures01 in core/rpc to dev-deps * Change wasm CI builds * Switch to async-std 1.0.1 * Remove async-std dep of network * Add modified lockfile * Fix node cli browser build * Remove authority-discovery async-std dep * Add Send + Sync to interval dyn stream
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
use std::collections::{BTreeMap, HashMap};
|
||||
use std::sync::Arc;
|
||||
use std::ops::Range;
|
||||
use futures03::{future, StreamExt as _, TryStreamExt as _};
|
||||
use futures::{future, StreamExt as _, TryStreamExt as _};
|
||||
use log::warn;
|
||||
use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId};
|
||||
use rpc::{
|
||||
|
||||
@@ -21,7 +21,7 @@ use std::{
|
||||
collections::{HashSet, HashMap, hash_map::Entry},
|
||||
};
|
||||
use codec::Decode;
|
||||
use futures03::{
|
||||
use futures::{
|
||||
future::{ready, Either},
|
||||
channel::oneshot::{channel, Sender},
|
||||
FutureExt, TryFutureExt,
|
||||
@@ -753,7 +753,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn maybe_share_remote_request_shares_request() {
|
||||
type UnreachableFuture = futures03::future::Ready<Result<u32, Error>>;
|
||||
type UnreachableFuture = futures::future::Ready<Result<u32, Error>>;
|
||||
|
||||
let shared_requests = SimpleSubscriptions::default();
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ use self::error::Error;
|
||||
|
||||
use std::sync::Arc;
|
||||
use assert_matches::assert_matches;
|
||||
use futures::stream::Stream;
|
||||
use futures01::stream::Stream;
|
||||
use primitives::storage::well_known_keys;
|
||||
use sr_io::hashing::blake2_256;
|
||||
use test_client::{
|
||||
|
||||
Reference in New Issue
Block a user