This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
CHT calculations for full nodes #4181
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
// Copyright 2015, 2016 Parity Technologies (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
//! Canonical hash trie definitions and helper functions. | ||
|
||
/// The size of each CHT. | ||
pub const SIZE: u64 = 2048; | ||
|
||
/// Convert a block number to a CHT number. | ||
/// Returns `None` for `block_num` == 0, `Some` otherwise. | ||
pub fn block_to_cht_number(block_num: u64) -> Option<u64> { | ||
match block_num { | ||
0 => None, | ||
n => Some((n - 1) / SIZE), | ||
} | ||
} | ||
|
||
/// Get the starting block of a given CHT. | ||
/// CHT 0 includes block 1...SIZE, | ||
/// CHT 1 includes block SIZE + 1 ... 2*SIZE | ||
/// More generally: CHT N includes block (1 + N*SIZE)...((N+1)*SIZE). | ||
/// This is because the genesis hash is assumed to be known | ||
/// and including it would be redundant. | ||
pub fn start_number(cht_num: u64) -> u64 { | ||
(cht_num * SIZE) + 1 | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
#[test] | ||
fn block_to_cht_number() { | ||
assert!(::cht::block_to_cht_number(0).is_none()); | ||
assert_eq!(::cht::block_to_cht_number(1).unwrap(), 0); | ||
assert_eq!(::cht::block_to_cht_number(::cht::SIZE + 1).unwrap(), 1); | ||
assert_eq!(::cht::block_to_cht_number(::cht::SIZE).unwrap(), 0); | ||
} | ||
|
||
#[test] | ||
fn start_number() { | ||
assert_eq!(::cht::start_number(0), 1); | ||
assert_eq!(::cht::start_number(1), ::cht::SIZE + 1); | ||
assert_eq!(::cht::start_number(2), ::cht::SIZE * 2 + 1); | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,6 +33,7 @@ | |
#![deny(missing_docs)] | ||
|
||
pub mod client; | ||
pub mod cht; | ||
pub mod net; | ||
pub mod on_demand; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not really clear that
needed_hdr
is always set. Isreq.block_number
guaranteed to be within the range?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's guaranteed by the check that
req.cht_number
is equal to the calculated CHT number based on the block number in the request. this means that the function has already returned in the case that the requested number wouldn't fall within the range of blocks we iterate.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Additionally, if we don't have all the blocks in that range, we also return early. The CHT number should probably be omitted in the future because it is derivable from a block number and only serves to give misbehaving peers a method of misbehavior.