grandpa: make it compile against GRANDPA with expose round state

paritytech · Apr 7, 2020 · e803c89 · e803c89
1 parent 7c4d5e7
commit e803c89
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
@@ -37,11 +37,13 @@ sp-finality-tracker = { version = "2.0.0-alpha.5", path = "../../primitives/fina
 sp-finality-grandpa = { version = "2.0.0-alpha.5", path = "../../primitives/finality-grandpa" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0-alpha.5"}
 sc-block-builder = { version = "0.8.0-alpha.5", path = "../block-builder" }
-finality-grandpa = { version = "0.11.2", features = ["derive-codec"] }
+#finality-grandpa = { version = "0.11.2", features = ["derive-codec"] }
+finality-grandpa = { git = "https://github.com/paritytech/finality-grandpa", branch = "andre/expose-voter-state-v11", features = ["derive-codec"] }
 pin-project = "0.4.6"
 
 [dev-dependencies]
-finality-grandpa = { version = "0.11.2", features = ["derive-codec", "test-helpers"] }
+#finality-grandpa = { version = "0.11.2", features = ["derive-codec", "test-helpers"] }
+finality-grandpa = { git = "https://github.com/paritytech/finality-grandpa", branch = "andre/expose-voter-state-v11", features = ["derive-codec", "test-helpers"] }
 sc-network = { version = "0.8.0-alpha.5", path = "../network" }
 sc-network-test = { version = "0.8.0-dev", path = "../network/test" }
 sp-keyring = { version = "2.0.0-alpha.5", path = "../../primitives/keyring" }

diff --git a/client/finality-grandpa/src/environment.rs b/client/finality-grandpa/src/environment.rs
@@ -580,23 +580,23 @@ where
 	Block: 'static,
 	B: Backend<Block>,
 	C: crate::ClientForGrandpa<Block, B> + 'static,
- 	N: NetworkT<Block> + 'static + Send,
+	N: NetworkT<Block> + 'static + Send + Sync,
 	SC: SelectChain<Block> + 'static,
 	VR: VotingRule<Block, C>,
 	NumberFor<Block>: BlockNumberOps,
 {
-	type Timer = Pin<Box<dyn Future<Output = Result<(), Self::Error>> + Send>>;
+	type Timer = Pin<Box<dyn Future<Output = Result<(), Self::Error>> + Send + Sync>>;
 	type Id = AuthorityId;
 	type Signature = AuthoritySignature;
 
 	// regular round message streams
 	type In = Pin<Box<dyn Stream<
 		Item = Result<::finality_grandpa::SignedMessage<Block::Hash, NumberFor<Block>, Self::Signature, Self::Id>, Self::Error>
-	> + Send>>;
+	> + Send + Sync>>;
 	type Out = Pin<Box<dyn Sink<
 		::finality_grandpa::Message<Block::Hash, NumberFor<Block>>,
 		Error = Self::Error,
-	> + Send>>;
+	> + Send + Sync>>;
 
 	type Error = CommandOrError<Block::Hash, NumberFor<Block>>;
 

diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
@@ -147,7 +147,7 @@ pub(crate) struct UntilImported<Block: BlockT, BlockStatus, BlockSyncRequester,
 	inner: Fuse<I>,
 	ready: VecDeque<M::Blocked>,
 	/// Interval at which to check status of each awaited block.
-	check_pending: Pin<Box<dyn Stream<Item = Result<(), std::io::Error>> + Send>>,
+	check_pending: Pin<Box<dyn Stream<Item = Result<(), std::io::Error>> + Send + Sync>>,
 	/// Mapping block hashes to their block number, the point in time it was
 	/// first encountered (Instant) and a list of GRANDPA messages referencing
 	/// the block hash.