From 4957a809d4c4e5f2e5d76ec56de83006d53562a1 Mon Sep 17 00:00:00 2001 From: FiveMovesAhead Date: Fri, 22 Aug 2025 14:22:26 +0100 Subject: [PATCH] Rename advance_id to algorithm_id. --- tig-protocol/src/contracts/players.rs | 14 +++++++------- tig-protocol/src/contracts/rewards.rs | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tig-protocol/src/contracts/players.rs b/tig-protocol/src/contracts/players.rs index 1cb077b..5c8d6ce 100644 --- a/tig-protocol/src/contracts/players.rs +++ b/tig-protocol/src/contracts/players.rs @@ -150,7 +150,7 @@ pub async fn set_reward_share( pub async fn set_vote( ctx: &T, player_id: String, - advance_id: String, + algorithm_id: String, yes: bool, ) -> Result<()> { let config = ctx.get_config().await; @@ -159,19 +159,19 @@ pub async fn set_vote( let player_state = ctx.get_player_state(&player_id).await.unwrap(); let advance_state = ctx - .get_advance_state(&advance_id) + .get_advance_state(&algorithm_id) .await - .ok_or_else(|| anyhow!("Invalid advance '{}'", advance_id))?; + .ok_or_else(|| anyhow!("Invalid advance '{}'", algorithm_id))?; if latest_block_details.round < advance_state.round_voting_starts || latest_block_details.round >= advance_state.round_votes_tallied { - return Err(anyhow!("Cannot vote on advance '{}'", advance_id)); + return Err(anyhow!("Cannot vote on advance '{}'", algorithm_id)); } - if player_state.votes.contains_key(&advance_id) { + if player_state.votes.contains_key(&algorithm_id) { return Err(anyhow!( "You have already voted on advance '{}'", - advance_id + algorithm_id )); } @@ -193,7 +193,7 @@ pub async fn set_vote( )); } - ctx.set_player_vote(player_id, advance_id, yes).await?; + ctx.set_player_vote(player_id, algorithm_id, yes).await?; Ok(()) } diff --git a/tig-protocol/src/contracts/rewards.rs b/tig-protocol/src/contracts/rewards.rs index e0733ac..a0f34da 100644 --- a/tig-protocol/src/contracts/rewards.rs +++ b/tig-protocol/src/contracts/rewards.rs @@ -88,10 +88,10 @@ pub(crate) async fn update(cache: &mut AddBlockCache) { let mut total_advances_reward = zero.clone(); let reward_pool_per_challenge = advances_reward_pool / PreciseNumber::from(active_challenge_ids.len()); - for advance_id in active_advance_ids.iter() { - let advance_state = &active_advances_state[advance_id]; - let advance_details = &active_advances_details[advance_id]; - let advance_data = active_advances_block_data.get_mut(advance_id).unwrap(); + for algorithm_id in active_advance_ids.iter() { + let advance_state = &active_advances_state[algorithm_id]; + let advance_details = &active_advances_details[algorithm_id]; + let advance_data = active_advances_block_data.get_mut(algorithm_id).unwrap(); let is_merged = advance_state.round_merged.is_some(); if advance_state.banned {