absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-10 13:09:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break coordinator main into multiple functions

Browse Source 
Also moves from std::sync::RwLock to tokio::sync::RwLock to prevent wasting
cycles on spinning.
This commit is contained in:
Luke Parker
2023-04-23 23:15:15 -04:00
parent be8c25aef0
commit c476f9b640
10 changed files with 263 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coordinator/tributary/src/tendermint.rs
View File

@@ -1,8 +1,5 @@
use core::ops::Deref;
use std::{
sync::{Arc, RwLock},
collections::HashMap,
};
use std::{sync::Arc, collections::HashMap};
use async_trait::async_trait;
@@ -34,7 +31,10 @@ use tendermint::{
},
};
use tokio::time::{Duration, sleep};
use tokio::{
sync::RwLock,
time::{Duration, sleep},
};
use crate::{
TENDERMINT_MESSAGE, ReadWrite, Transaction, BlockHeader, Block, BlockError, Blockchain, P2p,
@@ -273,7 +273,7 @@ impl<D: Db, T: Transaction, P: P2p> Network for TendermintNetwork<D, T, P> {
async fn validate(&mut self, block: &Self::Block) -> Result<(), TendermintBlockError> {
let block =
Block::read::<&[u8]>(&mut block.0.as_ref()).map_err(|_| TendermintBlockError::Fatal)?;
self.blockchain.read().unwrap().verify_block(&block).map_err(|e| match e {
self.blockchain.read().await.verify_block(&block).map_err(|e| match e {
BlockError::NonLocalProvided(_) => TendermintBlockError::Temporal,
_ => TendermintBlockError::Fatal,
})
@@ -301,7 +301,7 @@ impl<D: Db, T: Transaction, P: P2p> Network for TendermintNetwork<D, T, P> {
};
loop {
let block_res = self.blockchain.write().unwrap().add_block(&block, commit.encode());
let block_res = self.blockchain.write().await.add_block(&block, commit.encode());
match block_res {
Ok(()) => break,
Err(BlockError::NonLocalProvided(hash)) => {
@@ -316,6 +316,6 @@ impl<D: Db, T: Transaction, P: P2p> Network for TendermintNetwork<D, T, P> {
}
}
Some(TendermintBlock(self.blockchain.write().unwrap().build_block().serialize()))
Some(TendermintBlock(self.blockchain.write().await.build_block().serialize()))
}
}