grandpa-rpc: move JustificationNotification to grandpa-rpc

client/finality-grandpa/rpc/src/lib.rs

@@ -28,11 +28,12 @@ use jsonrpc_core::futures::{
 	stream::Stream as Stream01,
 	future::Future as Future01,
 };
+use serde::{Serialize, Deserialize};
 
 mod error;
 mod report;
 
-use sc_finality_grandpa::{JustificationNotification , GrandpaJustificationReceiver};
+use sc_finality_grandpa::GrandpaJustificationReceiver;
 use sp_runtime::traits::Block as BlockT;
 
 use report::{ReportAuthoritySet, ReportVoterState, ReportedRoundStates};
@@ -128,7 +129,7 @@ where
 		subscriber: Subscriber<JustificationNotification<Block>>
 	) {
 		let stream = self.justification_receiver.subscribe()
-			.map(|x| Ok::<_,()>(x))
+			.map(|x| Ok::<_,()>(JustificationNotification::from(x)))
 			.map_err(|e| warn!("Notification stream error: {:?}", e))
 			.compat();
 
@@ -149,6 +150,24 @@ where
 	}
 }
 
+/// Justification for a finalized block.
+#[derive(Clone, Serialize, Deserialize)]
+pub struct JustificationNotification<Block: BlockT> {
+	/// Highest finalized block header
+	pub header: Block::Header,
+	/// An encoded justification proving that the given header has been finalized
+	pub justification: Vec<u8>,
+}
+
+impl<Block: BlockT> From<(Block::Header, Vec<u8>)> for JustificationNotification<Block> {
+	fn from(notification: (Block::Header, Vec<u8>)) -> Self {
+		JustificationNotification {
+			header: notification.0,
+			justification: notification.1,
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;

client/finality-grandpa/src/environment.rs

@@ -51,7 +51,7 @@ use sp_consensus::SelectChain;
 use crate::authorities::{AuthoritySet, SharedAuthoritySet};
 use crate::communication::Network as NetworkT;
 use crate::consensus_changes::SharedConsensusChanges;
-use crate::notification::{GrandpaJustificationSender, JustificationNotification};
+use crate::notification::GrandpaJustificationSender;
 use crate::justification::GrandpaJustification;
 use crate::until_imported::UntilVoteTargetImported;
 use crate::voting_rule::VotingRule;
@@ -1185,10 +1185,7 @@ pub(crate) fn finalize_block<BE, Block, Client>(
 		if let Some(justification) = justification.clone() {
 			match client.header(BlockId::Hash(hash)) {
 				Ok(Some(header)) => {
-					let notification = JustificationNotification {
-						header,
-						justification,
-					};
+					let notification = (header, justification);
 					if let Some(sender) = justification_sender {
 						let _ = sender.notify(notification);
 					}

client/finality-grandpa/src/lib.rs

@@ -125,9 +125,7 @@ mod voting_rule;
 
 pub use authorities::SharedAuthoritySet;
 pub use finality_proof::{FinalityProofProvider, StorageAndProofProvider};
-pub use notification::{
-	GrandpaJustificationSender, GrandpaJustificationReceiver, JustificationNotification,
-};
+pub use notification::{GrandpaJustificationSender, GrandpaJustificationReceiver};
 pub use import::GrandpaBlockImport;
 pub use justification::GrandpaJustification;
 pub use light_import::light_block_import;

client/finality-grandpa/src/notification.rs

@@ -18,19 +18,12 @@
 
 use std::sync::Arc;
 use parking_lot::Mutex;
-use serde::{Deserialize, Serialize};
 
 use sp_runtime::traits::Block as BlockT;
 use sp_utils::mpsc::{tracing_unbounded, TracingUnboundedSender, TracingUnboundedReceiver};
 
 /// Justification for a finalized block.
-#[derive(Clone, Serialize, Deserialize)]
-pub struct JustificationNotification<Block: BlockT> {
-	/// Highest finalized block header
-	pub header: Block::Header,
-	/// An encoded justification proving that the given header has been finalized
-	pub justification: Vec<u8>,
-}
+type JustificationNotification<Block> = (<Block as BlockT>::Header, Vec<u8>);
 
 // Stream of justifications returned when subscribing.
 type JustificationStream<Block> = TracingUnboundedReceiver<JustificationNotification<Block>>;