Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2024-11-17 01:17:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove TODO about code de-duplication

Browse source 
It's infeasible to write a macro/function there. Does add a type alias which
makes things cleaner.
This commit is contained in:
Luke Parker 2023-05-10 01:19:01 -04:00
parent 168f2899f0
commit a70df6a449
No known key found for this signature in database
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
coordinator/src/main.rs
View file

@ -72,12 +72,14 @@ pub struct ActiveTributary<D: Db, P: P2p> {
pub tributary: Arc<RwLock<Tributary<D, Transaction, P>>>,
}
type Tributaries<D, P> = HashMap<[u8; 32], ActiveTributary<D, P>>;
// Adds a tributary into the specified HahMap
async fn add_tributary<D: Db, P: P2p>(
db: D,
key: Zeroizing<<Ristretto as Ciphersuite>::F>,
p2p: P,
tributaries: &mut HashMap<[u8; 32], ActiveTributary<D, P>>,
tributaries: &mut Tributaries<D, P>,
spec: TributarySpec,
) -> TributaryReader<D, Transaction> {
let tributary = Tributary::<_, Transaction, _>::new(
@ -150,7 +152,7 @@ pub async fn scan_tributaries<D: Db, Pro: Processors, P: P2p>(
recognized_id_send: UnboundedSender<([u8; 32], RecognizedIdType, [u8; 32])>,
p2p: P,
processors: Pro,
tributaries: Arc<RwLock<HashMap<[u8; 32], ActiveTributary<D, P>>>>,
tributaries: Arc<RwLock<Tributaries<D, P>>>,
) {
let mut tributary_readers = vec![];
for ActiveTributary { spec, tributary } in tributaries.read().await.values() {
@ -202,7 +204,7 @@ pub async fn scan_tributaries<D: Db, Pro: Processors, P: P2p>(
#[allow(clippy::type_complexity)]
pub async fn heartbeat_tributaries<D: Db, P: P2p>(
p2p: P,
tributaries: Arc<RwLock<HashMap<[u8; 32], ActiveTributary<D, P>>>>,
tributaries: Arc<RwLock<Tributaries<D, P>>>,
) {
let ten_blocks_of_time =
Duration::from_secs((10 * Tributary::<D, Transaction, P>::block_time()).into());
@ -230,7 +232,7 @@ pub async fn heartbeat_tributaries<D: Db, P: P2p>(
pub async fn handle_p2p<D: Db, P: P2p>(
our_key: <Ristretto as Ciphersuite>::G,
p2p: P,
tributaries: Arc<RwLock<HashMap<[u8; 32], ActiveTributary<D, P>>>>,
tributaries: Arc<RwLock<Tributaries<D, P>>>,
) {
loop {
let mut msg = p2p.receive().await;
@ -379,7 +381,7 @@ pub async fn handle_processors<D: Db, Pro: Processors, P: P2p>(
key: Zeroizing<<Ristretto as Ciphersuite>::F>,
serai: Serai,
mut processors: Pro,
tributaries: Arc<RwLock<HashMap<[u8; 32], ActiveTributary<D, P>>>>,
tributaries: Arc<RwLock<Tributaries<D, P>>>,
) {
let pub_key = Ristretto::generator() * key.deref();
@ -550,7 +552,6 @@ pub async fn handle_processors<D: Db, Pro: Processors, P: P2p>(
// There's no guarantee the Tributary will have been created though
panic!("processor is operating on tributary we don't have");
};
let tributary = tributary.tributary.read().await;
match tx.kind() {
@ -647,7 +648,6 @@ pub async fn run<D: Db, Pro: Processors, P: P2p>(
let nonce = 0; // TODO
tx.sign(&mut OsRng, genesis, &key, nonce);
// TODO: Consolidate this code with the above instance
let tributaries = tributaries.read().await;
let Some(tributary) = tributaries.get(&genesis) else {
panic!("tributary we don't have came to consensus on an ExternalBlock");