Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix round timer #26

Merged
merged 10 commits into from
Jan 16, 2020
Merged

Fix round timer #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5cd8095
Add name option to timer to make timer log includes timer name.
rantan Jan 14, 2020
c226c9c
Make the node don't wait 10s for getting redis connection.
rantan Jan 14, 2020
34241f9
Fix failure when checking blocksig message.
rantan Jan 14, 2020
f6aee91
Fix round timer control
rantan Jan 14, 2020
3ddf713
Change ROUND_TIMELIMIT_DELTA to 10s
rantan Jan 14, 2020
d119f10
fix failure unit test
rantan Jan 15, 2020
e90d4b5
Make it ignore completeblock message from illegal node
rantan Jan 15, 2020
83ba4b7
fmt
rantan Jan 16, 2020
70b9de4
Change Block#signhash returns has value not Result
rantan Jan 16, 2020
a3fdae2
Change Block#hash returns has value not Result
rantan Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions src/blockdata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,24 @@ impl Block {

/// Returns hash for signing. This hash value doesn't include proof field. Actual block hash
/// includes proof data.
pub fn sighash(&self) -> Result<hash::Hash, Error> {
pub fn sighash(&self) -> hash::Hash {
let header = self.get_header_without_proof();
let hash = sha256d::Hash::hash(header).into_inner();
Ok(hash::Hash::from_slice(&hash)?)
hash::Hash::from_slice(&hash)
.expect("couldn't convert to blockdata::hash::Hash from sha256d::hash")
}

/// Returns block hash
pub fn hash(&self) -> Result<hash::Hash, Error> {
if self.0[Self::PROOF_POSITION] == 0 {
return Err(Error::IncompleteBlock);
}

let header = &self.0[..(Self::PROOF_POSITION + 65)]; // length byte + signature(64 bytes)
pub fn hash(&self) -> hash::Hash {
let header = if self.0[Self::PROOF_POSITION] == 0 {
&self.0[..(Self::PROOF_POSITION + 1)] // length byte
} else {
&self.0[..(Self::PROOF_POSITION + 65)] // length byte + signature(64 bytes)
};

let hash = sha256d::Hash::hash(header).into_inner();
Ok(hash::Hash::from_slice(&hash)?)
hash::Hash::from_slice(&hash)
.expect("couldn't convert to blockdata::hash::Hash from sha256d::hash")
}

pub fn payload(&self) -> &[u8] {
Expand Down Expand Up @@ -150,21 +152,18 @@ mod tests {
#[test]
fn test_hash() {
let block = test_block();
let hash = block.hash().unwrap();
let hash = block.hash();

assert_eq!(
format!("{:?}", hash),
"Hash(86dbdec1ab22f4d43ef164ea5198bf6d4d96ea6ef97ca2dea97a40657af6d789)"
);

let incomplete_block = test_block_without_proof();
assert!(incomplete_block.hash().is_err());
}

#[test]
fn test_block_hash_debug_fmt() {
let block = test_block();
let hash = block.sighash().unwrap();
let hash = block.sighash();

assert_eq!(
format!("{:?}", hash),
Expand Down
Loading