Skip to content

Commit

Permalink
remove prints
Browse files Browse the repository at this point in the history
  • Loading branch information
@Longarithm
Longarithm committed Jun 6, 2024
1 parent 66d9c8d commit afd32bb
Show file tree
Hide file tree
Showing 8 changed files with 249 additions and 271 deletions.
16 changes: 8 additions & 8 deletions chain/epoch-manager/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ use near_primitives::shard_layout::ShardLayout;
use near_primitives::stateless_validation::ChunkValidatorAssignments;
use near_primitives::types::validator_stake::ValidatorStake;
use near_primitives::types::{
AccountId, ApprovalStake, Balance, BlockChunkValidatorStats, BlockHeight, ChunkValidatorStats,
EpochId, EpochInfoProvider, NumSeats, ShardId, ValidatorId, ValidatorInfoIdentifier,
AccountId, ApprovalStake, Balance, BlockChunkValidatorStats, BlockHeight, ChunkStats, EpochId,
EpochInfoProvider, NumSeats, ShardId, ValidatorId, ValidatorInfoIdentifier,
ValidatorKickoutReason, ValidatorStats,
};
use near_primitives::version::{ProtocolVersion, UPGRADABILITY_FIX_PROTOCOL_VERSION};
Expand Down Expand Up @@ -474,7 +474,7 @@ impl EpochManager {
config: &EpochConfig,
epoch_info: &EpochInfo,
block_validator_tracker: &HashMap<ValidatorId, ValidatorStats>,
chunk_validator_tracker: &HashMap<ShardId, HashMap<ValidatorId, ChunkValidatorStats>>,
chunk_stats_tracker: &HashMap<ShardId, HashMap<ValidatorId, ChunkStats>>,
slashed: &HashMap<AccountId, SlashState>,
prev_validator_kickout: &HashMap<AccountId, ValidatorKickoutReason>,
) -> (HashMap<AccountId, BlockChunkValidatorStats>, HashMap<AccountId, ValidatorKickoutReason>)
Expand All @@ -496,8 +496,8 @@ impl EpochManager {
.get(&(i as u64))
.unwrap_or(&ValidatorStats { expected: 0, produced: 0 })
.clone();
let mut chunk_stats = ChunkValidatorStats::default();
for (_, tracker) in chunk_validator_tracker.iter() {
let mut chunk_stats = ChunkStats::default();
for (_, tracker) in chunk_stats_tracker.iter() {
if let Some(stat) = tracker.get(&(i as u64)) {
*chunk_stats.expected_mut() += stat.expected();
*chunk_stats.produced_mut() += stat.produced();
Expand Down Expand Up @@ -1377,7 +1377,7 @@ impl EpochManager {
.get(info.account_id())
.unwrap_or(&BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 0, expected: 0 },
chunk_stats: ChunkValidatorStats {
chunk_stats: ChunkStats {
production: ValidatorStats { produced: 0, expected: 0 },
endorsement: ValidatorStats { produced: 0, expected: 0 },
},
Expand Down Expand Up @@ -1435,9 +1435,9 @@ impl EpochManager {
.unwrap_or(&ValidatorStats { produced: 0, expected: 0 })
.clone();

let mut chunks_stats_by_shard: HashMap<ShardId, ChunkValidatorStats> =
let mut chunks_stats_by_shard: HashMap<ShardId, ChunkStats> =
HashMap::new();
let mut chunk_stats = ChunkValidatorStats::default();
let mut chunk_stats = ChunkStats::default();
for (shard, tracker) in aggregator.shard_tracker.iter() {
if let Some(stats) = tracker.get(&(validator_id as u64)) {
let produced = stats.produced();
Expand Down
30 changes: 15 additions & 15 deletions chain/epoch-manager/src/reward_calculator.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ impl RewardCalculator {
#[cfg(test)]
mod tests {
use super::*;
use near_primitives::types::{BlockChunkValidatorStats, ChunkValidatorStats, ValidatorStats};
use near_primitives::types::{BlockChunkValidatorStats, ChunkStats, ValidatorStats};
use near_primitives::version::PROTOCOL_VERSION;
use num_rational::Ratio;
use std::collections::HashMap;
Expand All @@ -231,14 +231,14 @@ mod tests {
"test1".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 0, expected: 0 },
chunk_stats: ChunkValidatorStats::default(),
chunk_stats: ChunkStats::default(),
},
),
(
"test2".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 0, expected: 1 },
chunk_stats: ChunkValidatorStats::new_with_production(0, 1),
chunk_stats: ChunkStats::new_with_production(0, 1),
},
),
]);
Expand Down Expand Up @@ -282,21 +282,21 @@ mod tests {
"test1".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 945, expected: 1000 },
chunk_stats: ChunkValidatorStats::new_with_production(945, 1000),
chunk_stats: ChunkStats::new_with_production(945, 1000),
},
),
(
"test2".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 999, expected: 1000 },
chunk_stats: ChunkValidatorStats::new_with_production(999, 1000),
chunk_stats: ChunkStats::new_with_production(999, 1000),
},
),
(
"test3".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 850, expected: 1000 },
chunk_stats: ChunkValidatorStats::new_with_production(850, 1000),
chunk_stats: ChunkStats::new_with_production(850, 1000),
},
),
]);
Expand Down Expand Up @@ -347,23 +347,23 @@ mod tests {
"test1".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 945, expected: 1000 },
chunk_stats: ChunkValidatorStats::new_with_production(945, 1000),
chunk_stats: ChunkStats::new_with_production(945, 1000),
},
),
// chunk only producer
(
"test2".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 0, expected: 0 },
chunk_stats: ChunkValidatorStats::new_with_production(999, 1000),
chunk_stats: ChunkStats::new_with_production(999, 1000),
},
),
// block only producer (not implemented right now, just for testing)
(
"test3".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 945, expected: 1000 },
chunk_stats: ChunkValidatorStats::default(),
chunk_stats: ChunkStats::default(),
},
),
// a validator that expected blocks and chunks are both 0 (this could occur with very
Expand All @@ -372,7 +372,7 @@ mod tests {
"test4".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 0, expected: 0 },
chunk_stats: ChunkValidatorStats::default(),
chunk_stats: ChunkStats::default(),
},
),
]);
Expand Down Expand Up @@ -428,7 +428,7 @@ mod tests {
"test1".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 945, expected: 1000 },
chunk_stats: ChunkValidatorStats {
chunk_stats: ChunkStats {
production: ValidatorStats { produced: 944, expected: 1000 },
endorsement: ValidatorStats { produced: 946, expected: 1000 },
},
Expand All @@ -439,7 +439,7 @@ mod tests {
"test2".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 0, expected: 0 },
chunk_stats: ChunkValidatorStats {
chunk_stats: ChunkStats {
production: ValidatorStats { produced: 998, expected: 1000 },
endorsement: ValidatorStats { produced: 1000, expected: 1000 },
},
Expand All @@ -450,15 +450,15 @@ mod tests {
"test3".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 940, expected: 1000 },
chunk_stats: ChunkValidatorStats::new_with_endorsement(950, 1000),
chunk_stats: ChunkStats::new_with_endorsement(950, 1000),
},
),
// Endorsements only
(
"test4".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 0, expected: 0 },
chunk_stats: ChunkValidatorStats::new_with_endorsement(1000, 1000),
chunk_stats: ChunkStats::new_with_endorsement(1000, 1000),
},
),
]);
Expand Down Expand Up @@ -514,7 +514,7 @@ mod tests {
"test".parse().unwrap(),
BlockChunkValidatorStats {
block_stats: ValidatorStats { produced: 43200, expected: 43200 },
chunk_stats: ChunkValidatorStats {
chunk_stats: ChunkStats {
production: ValidatorStats { produced: 345600, expected: 345600 },
endorsement: ValidatorStats { produced: 345600, expected: 345600 },
},
Expand Down
22 changes: 5 additions & 17 deletions chain/epoch-manager/src/test_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ use near_crypto::{KeyType, SecretKey};
use near_primitives::challenge::SlashedValidator;
use near_primitives::epoch_manager::block_info::BlockInfoV2;
use near_primitives::epoch_manager::epoch_info::EpochInfo;
use near_primitives::epoch_manager::{
AllEpochConfig, EpochConfig, ValidatorSelectionConfig, ValidatorWeight,
};
use near_primitives::epoch_manager::{AllEpochConfig, EpochConfig, ValidatorSelectionConfig};
use near_primitives::hash::{hash, CryptoHash};
use near_primitives::types::validator_stake::ValidatorStake;
use near_primitives::types::{
Expand Down Expand Up @@ -50,25 +48,17 @@ pub fn epoch_info(
accounts: Vec<(AccountId, Balance)>,
block_producers_settlement: Vec<ValidatorId>,
chunk_producers_settlement: Vec<Vec<ValidatorId>>,
hidden_validators_settlement: Vec<ValidatorWeight>,
fishermen: Vec<(AccountId, Balance)>,
stake_change: BTreeMap<AccountId, Balance>,
validator_kickout: Vec<(AccountId, ValidatorKickoutReason)>,
validator_reward: HashMap<AccountId, Balance>,
minted_amount: Balance,
) -> EpochInfo {
let num_seats = block_producers_settlement.len() as u64;
epoch_info_with_num_seats(
epoch_height,
accounts,
block_producers_settlement,
chunk_producers_settlement,
hidden_validators_settlement,
fishermen,
stake_change,
validator_kickout,
validator_reward,
minted_amount,
Default::default(),
Default::default(),
Default::default(),
0,
num_seats,
)
}
Expand All @@ -78,8 +68,6 @@ pub fn epoch_info_with_num_seats(
mut accounts: Vec<(AccountId, Balance)>,
block_producers_settlement: Vec<ValidatorId>,
chunk_producers_settlement: Vec<Vec<ValidatorId>>,
_hidden_validators_settlement: Vec<ValidatorWeight>,
_fishermen: Vec<(AccountId, Balance)>,
stake_change: BTreeMap<AccountId, Balance>,
validator_kickout: Vec<(AccountId, ValidatorKickoutReason)>,
validator_reward: HashMap<AccountId, Balance>,
Expand Down
Loading

0 comments on commit afd32bb

Please sign in to comment.