Switch GrandPa to std futures (replaces #3909) (#4612)

* Switch GrandPa to new futures

* Work on making tests work

* until_imported tests working again

* Work on switching tests to stable futures

* Modifications

* Re-add test as #[ignore]

* Don't ignore

* Add manual unpins

* Remove Header import

* Return concrete Sink type

* Switch to crates.io finality-grandpa version

* Remove use statement that slipped in

* Fix some nitpicks

* Remove unpin from i

* Fixed typo

* Move futures01 to dev-deps

* Fix nitpicks

* Update client/finality-grandpa/src/communication/mod.rs

Co-Authored-By: André Silva <andre.beat@gmail.com>

* nitpicking

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: André Silva <andre.beat@gmail.com>
This commit is contained in:
Ashley
2020-01-24 13:34:42 +01:00
committed by GitHub
parent 14e95f3398
commit c2c429877e
16 changed files with 468 additions and 513 deletions
+5 -4
View File
@@ -6,8 +6,7 @@ edition = "2018"
[dependencies]
fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
futures = "0.1.29"
futures03 = { package = "futures", version = "0.3.1", features = ["compat"] }
futures = "0.3.1"
futures-timer = "2.0.2"
log = "0.4.8"
parking_lot = "0.9.0"
@@ -28,10 +27,11 @@ sc-network = { version = "0.8", path = "../network" }
sc-network-gossip = { version = "0.8", path = "../network-gossip" }
sp-finality-tracker = { version = "2.0.0", path = "../../primitives/finality-tracker" }
sp-finality-grandpa = { version = "2.0.0", path = "../../primitives/finality-grandpa" }
finality-grandpa = { version = "0.10.3", features = ["derive-codec"] }
finality-grandpa = { version = "0.11.0", features = ["derive-codec"] }
pin-project = "0.4.6"
[dev-dependencies]
finality-grandpa = { version = "0.10.3", features = ["derive-codec", "test-helpers"] }
finality-grandpa = { version = "0.11.0", features = ["derive-codec", "test-helpers"] }
sc-network = { version = "0.8", path = "../network" }
sc-network-test = { version = "0.8.0", path = "../network/test" }
sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
@@ -42,3 +42,4 @@ env_logger = "0.7.0"
tokio = "0.1.22"
tempfile = "3.1.0"
sp-api = { version = "2.0.0", path = "../../primitives/api" }
futures01 = { package = "futures", version = "0.1.29" }