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

merge genesis complete block with genesis ended

Browse Source
This commit is contained in:
akildemir
2024-08-15 12:51:05 +03:00
committed by Luke Parker
parent efc45c391b
commit a2df54dd6a
5 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
substrate/client/src/serai/genesis_liquidity.rs
View File

@@ -63,8 +63,7 @@ impl<'a> SeraiGenesisLiquidity<'a> {
Ok(self.0.storage(PALLET, "Supply", coin).await?.unwrap_or(LiquidityAmount::zero()))
}
pub async fn genesis_complete(&self) -> Result<bool, SeraiError> {
let result: Option<()> = self.0.storage(PALLET, "GenesisComplete", ()).await?;
Ok(result.is_some())
pub async fn genesis_complete_block(&self) -> Result<Option<u64>, SeraiError> {
self.0.storage(PALLET, "GenesisCompleteBlock", ()).await
}
}

22
substrate/client/tests/emissions.rs
View File

@@ -54,18 +54,18 @@ async fn test_emissions(serai: Serai) {
let (_, mut batch_ids) = set_up_genesis(&serai, &coins, &values).await;
// wait until genesis is complete
while !serai
.as_of_latest_finalized_block()
.await
.unwrap()
.genesis_liquidity()
.genesis_complete()
.await
.unwrap()
{
let mut genesis_complete_block = None;
while genesis_complete_block.is_none() {
tokio::time::sleep(Duration::from_secs(1)).await;
genesis_complete_block = serai
.as_of_latest_finalized_block()
.await
.unwrap()
.genesis_liquidity()
.genesis_complete_block()
.await
.unwrap();
}
let genesis_complete_block = serai.latest_finalized_block().await.unwrap().number();
for _ in 0 .. 3 {
// get current stakes
@@ -99,7 +99,7 @@ async fn test_emissions(serai: Serai) {
// calculate how much reward in this session
let reward_this_epoch =
if change_block_number < (genesis_complete_block + FAST_EPOCH_INITIAL_PERIOD) {
if change_block_number < (genesis_complete_block.unwrap() + FAST_EPOCH_INITIAL_PERIOD) {
block_count * INITIAL_REWARD_PER_BLOCK
} else {
let blocks_until = SECURE_BY - change_block_number;

5
substrate/client/tests/genesis_liquidity.rs
View File

@@ -24,14 +24,15 @@ pub async fn test_genesis_liquidity(serai: Serai) {
let (accounts, _) = set_up_genesis(&serai, &coins, &values).await;
// wait until genesis is complete
while !serai
while serai
.as_of_latest_finalized_block()
.await
.unwrap()
.genesis_liquidity()
.genesis_complete()
.genesis_complete_block()
.await
.unwrap()
.is_none()
{
tokio::time::sleep(Duration::from_secs(1)).await;
}