milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Remove Default impl for Target and Work 

A zero default value for `Target` and `Work` has no significance and/or
usecase, remove the derived `Default` implementation.

Includes making `Target::ZERO` public.
This commit is contained in:
Tobin C. Harding 2022-09-30 09:16:56 +10:00
parent cb9893c4a9
commit 02a2b43b2b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitcoin/src/blockdata/block.rs
View File

@ -513,7 +513,7 @@ mod tests {
assert_eq!(some_header.validate_pow(some_header.target()).unwrap(), some_header.block_hash()); assert_eq!(some_header.validate_pow(some_header.target()).unwrap(), some_header.block_hash());
// test with zero target // test with zero target
match some_header.validate_pow(Target::default()) { match some_header.validate_pow(Target::ZERO) {
Err(BlockBadTarget) => (), Err(BlockBadTarget) => (),
_ => panic!("unexpected result from validate_pow"), _ => panic!("unexpected result from validate_pow"),
} }

8
bitcoin/src/pow.rs
View File

@ -90,7 +90,7 @@ macro_rules! do_impl {
/// Work is a measure of how difficult it is to find a hash below a given [`Target`]. /// Work is a measure of how difficult it is to find a hash below a given [`Target`].
/// ///
/// ref: <https://en.bitcoin.it/wiki/Work> /// ref: <https://en.bitcoin.it/wiki/Work>
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(crate = "actual_serde"))] #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
pub struct Work(U256); pub struct Work(U256);
@ -130,14 +130,14 @@ impl Sub for Work {
/// a block. (See also [`Work`].) /// a block. (See also [`Work`].)
/// ///
/// ref: <https://en.bitcoin.it/wiki/Target> /// ref: <https://en.bitcoin.it/wiki/Target>
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(crate = "actual_serde"))] #[cfg_attr(feature = "serde", serde(crate = "actual_serde"))]
pub struct Target(U256); pub struct Target(U256);
impl Target { impl Target {
// When parsing nBits, Bitcoin Core converts a negative target threshold into a target of zero. /// When parsing nBits, Bitcoin Core converts a negative target threshold into a target of zero.
const ZERO: Target = Target(U256::ZERO); pub const ZERO: Target = Target(U256::ZERO);
/// The maximum possible target. /// The maximum possible target.
/// ///
/// This value is used to calculate difficulty, which is defined as how difficult the current /// This value is used to calculate difficulty, which is defined as how difficult the current