Refactoring Checkpoint: (WIP)

bizinikiwi/client/consensus/grandpa/src/authorities.rs

@@ -22,7 +22,7 @@ use std::{cmp::Ord, fmt::Debug, ops::Add};
 
 use codec::{Decode, Encode};
 use finality_grandpa::voter_set::VoterSet;
-use fork_tree::{FilterAction, ForkTree};
+use pez_fork_tree::{FilterAction, ForkTree};
 use log::debug;
 use parking_lot::MappedMutexGuard;
 use pezsc_consensus::shared_data::{SharedData, SharedDataLocked};
@@ -48,14 +48,14 @@ pub enum Error<N, E> {
 	)]
 	ForcedAuthoritySetChangeDependencyUnsatisfied(N),
 	#[error("Invalid operation in the pending changes tree: {0}")]
-	ForkTree(fork_tree::Error<E>),
+	ForkTree(pez_fork_tree::Error<E>),
 }
 
-impl<N, E> From<fork_tree::Error<E>> for Error<N, E> {
-	fn from(err: fork_tree::Error<E>) -> Error<N, E> {
+impl<N, E> From<pez_fork_tree::Error<E>> for Error<N, E> {
+	fn from(err: pez_fork_tree::Error<E>) -> Error<N, E> {
 		match err {
-			fork_tree::Error::Client(err) => Error::Client(err),
-			fork_tree::Error::Duplicate => Error::DuplicateAuthoritySetChange,
+			pez_fork_tree::Error::Client(err) => Error::Client(err),
+			pez_fork_tree::Error::Duplicate => Error::DuplicateAuthoritySetChange,
 			err => Error::ForkTree(err),
 		}
 	}
@@ -558,7 +558,7 @@ where
 			is_descendent_of,
 			|change| change.effective_number() <= finalized_number,
 		)? {
-			fork_tree::FinalizationResult::Changed(change) => {
+			pez_fork_tree::FinalizationResult::Changed(change) => {
 				status.changed = true;
 
 				let pending_forced_changes = std::mem::take(&mut self.pending_forced_changes);
@@ -595,7 +595,7 @@ where
 					status.new_set_block = Some((finalized_hash, finalized_number));
 				}
 			},
-			fork_tree::FinalizationResult::Unchanged => {},
+			pez_fork_tree::FinalizationResult::Unchanged => {},
 		}
 
 		Ok(status)
@@ -1050,7 +1050,7 @@ mod tests {
 		// trying to finalize past `change_c` without finalizing `change_a` first
 		assert!(matches!(
 			authorities.apply_standard_changes("hash_d", 40, &is_descendent_of, false, None),
-			Err(Error::ForkTree(fork_tree::Error::UnfinalizedAncestor))
+			Err(Error::ForkTree(pez_fork_tree::Error::UnfinalizedAncestor))
 		));
 		assert_eq!(authorities.authority_set_changes, AuthoritySetChanges::empty());
 

bizinikiwi/client/consensus/grandpa/src/aux_schema.rs

@@ -24,7 +24,7 @@ use codec::{Decode, Encode};
 use finality_grandpa::round::State as RoundState;
 use log::{info, warn};
 
-use fork_tree::ForkTree;
+use pez_fork_tree::ForkTree;
 use pezsc_client_api::backend::AuxStore;
 use pezsp_blockchain::{Error as ClientError, Result as ClientResult};
 use pezsp_consensus_grandpa::{AuthorityList, RoundNumber, SetId};

bizinikiwi/client/consensus/grandpa/src/import.rs

@@ -486,7 +486,7 @@ where
 				let authority_set = AuthoritySet::new(
 					authorities.clone(),
 					set_id,
-					fork_tree::ForkTree::new(),
+					pez_fork_tree::ForkTree::new(),
 					Vec::new(),
 					AuthoritySetChanges::empty(),
 				)