gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow votes to timestamp subsequent slots with the same timestamp (#11715) (#11720)

Browse Source 
(cherry picked from commit b1bc901a66)

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
This commit is contained in:
mergify[bot]
2020-08-20 00:40:04 +00:00
committed by GitHub
parent abce60efdf
commit 6c03e6c4b5
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
programs/vote/src/vote_state/mod.rs
View File

@ -556,7 +556,7 @@ impl VoteState {
timestamp: UnixTimestamp, timestamp: UnixTimestamp,
) -> Result<(), VoteError> { ) -> Result<(), VoteError> {
if (slot < self.last_timestamp.slot || timestamp < self.last_timestamp.timestamp) if (slot < self.last_timestamp.slot || timestamp < self.last_timestamp.timestamp)
|| ((slot == self.last_timestamp.slot || timestamp == self.last_timestamp.timestamp) || (slot == self.last_timestamp.slot
&& BlockTimestamp { slot, timestamp } != self.last_timestamp && BlockTimestamp { slot, timestamp } != self.last_timestamp
&& self.last_timestamp.slot != 0) && self.last_timestamp.slot != 0)
{ {
@ -1742,10 +1742,6 @@ mod tests {
vote_state.process_timestamp(slot + 1, timestamp - 1), vote_state.process_timestamp(slot + 1, timestamp - 1),
Err(VoteError::TimestampTooOld) Err(VoteError::TimestampTooOld)
); );
assert_eq!(
vote_state.process_timestamp(slot + 1, timestamp),
Err(VoteError::TimestampTooOld)
);
assert_eq!( assert_eq!(
vote_state.process_timestamp(slot, timestamp + 1), vote_state.process_timestamp(slot, timestamp + 1),
Err(VoteError::TimestampTooOld) Err(VoteError::TimestampTooOld)
@ -1755,14 +1751,22 @@ mod tests {
vote_state.last_timestamp, vote_state.last_timestamp,
BlockTimestamp { slot, timestamp } BlockTimestamp { slot, timestamp }
); );
assert_eq!(vote_state.process_timestamp(slot + 1, timestamp), Ok(()));
assert_eq!( assert_eq!(
vote_state.process_timestamp(slot + 1, timestamp + 1), vote_state.last_timestamp,
BlockTimestamp {
slot: slot + 1,
timestamp
}
);
assert_eq!(
vote_state.process_timestamp(slot + 2, timestamp + 1),
Ok(()) Ok(())
); );
assert_eq!( assert_eq!(
vote_state.last_timestamp, vote_state.last_timestamp,
BlockTimestamp { BlockTimestamp {
slot: slot + 1, slot: slot + 2,
timestamp: timestamp + 1 timestamp: timestamp + 1
} }
); );