A0-4341: Reexport useful traits and types

README.md

@@ -60,7 +60,7 @@ More details are available [in the book][reference-link-implementation-details].
 - Import AlephBFT in your crate
   ```toml
   [dependencies]
-  aleph-bft = "^0.38"
+  aleph-bft = "^0.39"
   ```
 - The main entry point is the `run_session` function, which returns a Future that runs the
   consensus algorithm.

consensus/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aleph-bft"
-version = "0.38.2"
+version = "0.39.0"
 edition = "2021"
 authors = ["Cardinal Cryptography"]
 categories = ["algorithms", "data-structures", "cryptography", "database"]

consensus/src/extension/mod.rs

@@ -1,10 +1,9 @@
-use crate::{dag::DagUnit, MultiKeychain};
+use crate::{dag::DagUnit, MultiKeychain, UnitFinalizationHandler};
 
 mod election;
 mod extender;
 mod units;
 
-use aleph_bft_types::UnitFinalizationHandler;
 use extender::Extender;
 
 /// A struct responsible for executing the Consensus protocol on a local copy of the Dag.

consensus/src/lib.rs

@@ -20,10 +20,11 @@ mod task_queue;
 mod testing;
 
 pub use aleph_bft_types::{
-    Data, DataProvider, Hasher, IncompleteMultisignatureError, Index, Indexed, Keychain,
-    MultiKeychain, Multisigned, Network, NodeCount, NodeIndex, NodeMap, NodeSubset,
-    PartialMultisignature, PartiallyMultisigned, Recipient, Round, SessionId, Signable, Signature,
-    SignatureError, SignatureSet, Signed, SpawnHandle, TaskHandle, UncheckedSigned,
+    Data, DataProvider, FinalizationHandler, Hasher, IncompleteMultisignatureError, Index, Indexed,
+    Keychain, MultiKeychain, Multisigned, Network, NodeCount, NodeIndex, NodeMap, NodeSubset,
+    OrderedUnit, PartialMultisignature, PartiallyMultisigned, Recipient, Round, SessionId,
+    Signable, Signature, SignatureError, SignatureSet, Signed, SpawnHandle, TaskHandle,
+    UncheckedSigned, UnitFinalizationHandler,
 };
 pub use config::{
     create_config, default_config, default_delay_config, exponential_slowdown, Config, DelayConfig,

consensus/src/member.rs

@@ -8,10 +8,11 @@ use crate::{
     },
     task_queue::TaskQueue,
     units::{UncheckedSignedUnit, Unit, UnitCoord},
-    Config, Data, DataProvider, Hasher, MultiKeychain, Network, NodeIndex, Receiver, Recipient,
-    Round, Sender, Signature, SpawnHandle, Terminator, UncheckedSigned,
+    Config, Data, DataProvider, FinalizationHandler, Hasher, MultiKeychain, Network, NodeIndex,
+    OrderedUnit, Receiver, Recipient, Round, Sender, Signature, SpawnHandle, Terminator,
+    UncheckedSigned, UnitFinalizationHandler,
 };
-use aleph_bft_types::{FinalizationHandler, NodeMap, OrderedUnit, UnitFinalizationHandler};
+use aleph_bft_types::NodeMap;
 use codec::{Decode, Encode};
 use futures::{channel::mpsc, pin_mut, AsyncRead, AsyncWrite, FutureExt, StreamExt};
 use futures_timer::Delay;

consensus/src/runway/mod.rs

@@ -10,10 +10,10 @@ use crate::{
         SignedUnit, UncheckedSignedUnit, Unit, UnitCoord, UnitStore, UnitStoreStatus, Validator,
         WrappedUnit,
     },
-    Config, Data, DataProvider, Hasher, Index, Keychain, MultiKeychain, NodeIndex, Receiver, Round,
-    Sender, Signature, SpawnHandle, Terminator, UncheckedSigned,
+    Config, Data, DataProvider, Hasher, Index, Keychain, MultiKeychain, NodeIndex, Receiver,
+    Recipient, Round, Sender, Signature, SpawnHandle, Terminator, UncheckedSigned,
+    UnitFinalizationHandler,
 };
-use aleph_bft_types::{Recipient, UnitFinalizationHandler};
 use futures::{
     channel::{mpsc, oneshot},
     future::pending,

consensus/src/testing/dag.rs

@@ -9,10 +9,9 @@ use crate::{
         ControlHash, FullUnit, PreUnit, SignedUnit as GenericSignedUnit, Unit, UnitStore,
         UnitWithParents as _, Validator,
     },
-    NodeCount, NodeIndex, NodeMap, NodeSubset, Round, Signed,
+    NodeCount, NodeIndex, NodeMap, NodeSubset, OrderedUnit, Round, Signed, UnitFinalizationHandler,
 };
 use aleph_bft_mock::{Data, Hash64, Hasher64, Keychain};
-use aleph_bft_types::{OrderedUnit, UnitFinalizationHandler};
 use log::debug;
 use parking_lot::Mutex;
 use rand::{distributions::Open01, prelude::*};