Skip to content

Fix inconsistent naming in the dummy key hash structs #463

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

Merged
merged 2 commits into from
Sep 26, 2022
Merged

Fix inconsistent naming in the dummy key hash structs #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
637f5ce
MSRV fixes for once_cell
sanket1729 Sep 21, 2022
af5d2d2
Fix inconsistent naming in the dummy key hash structs
afilini Sep 26, 2022
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
5 changes: 5 additions & 0 deletions contrib/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,15 @@ if cargo --version | grep "1\.41\.0"; then
MSRV=true
fi

if cargo --version | grep "1\.47\.0"; then
cargo update -p once_cell --precise 1.13.1
fi

# form_urlencoded 1.1.0 breaks MSRV.
if [ "$MSRV" = true ]; then
cargo update -p url --precise 2.2.2
cargo update -p form_urlencoded --precise 1.0.1
cargo update -p once_cell --precise 1.13.1
fi

# Format if told to
Expand Down
28 changes: 14 additions & 14 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ impl ToPublicKey for bitcoin::secp256k1::XOnlyPublicKey {
}

/// Dummy key which de/serializes to the empty string; useful sometimes for testing
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Default)]
pub struct DummyKey;

impl str::FromStr for DummyKey {
Expand All @@ -375,7 +375,7 @@ impl str::FromStr for DummyKey {
impl MiniscriptKey for DummyKey {
type RawPkHash = DummyKeyHash;
type Sha256 = DummySha256Hash;
type Hash256 = DummyHash256;
type Hash256 = DummyHash256Hash;
type Ripemd160 = DummyRipemd160Hash;
type Hash160 = DummyHash160Hash;

Expand Down Expand Up @@ -413,7 +413,7 @@ impl ToPublicKey for DummyKey {
.unwrap()
}

fn to_hash256(_hash: &DummyHash256) -> hash256::Hash {
fn to_hash256(_hash: &DummyHash256Hash) -> hash256::Hash {
hash256::Hash::from_str("50863ad64a87ae8a2fe83c1af1a8403cb53f53e486d8511dad8a04887e5b2352")
.unwrap()
}
Expand All @@ -428,7 +428,7 @@ impl ToPublicKey for DummyKey {
}

/// Dummy keyhash which de/serializes to the empty string; useful sometimes for testing
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Default)]
pub struct DummyKeyHash;

impl str::FromStr for DummyKeyHash {
Expand All @@ -455,7 +455,7 @@ impl hash::Hash for DummyKeyHash {
}

/// Dummy keyhash which de/serializes to the empty string; useful for testing
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Default)]
pub struct DummySha256Hash;

impl str::FromStr for DummySha256Hash {
Expand All @@ -482,22 +482,22 @@ impl hash::Hash for DummySha256Hash {
}

/// Dummy keyhash which de/serializes to the empty string; useful for testing
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
pub struct DummyHash256;
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Default)]
pub struct DummyHash256Hash;

impl str::FromStr for DummyHash256 {
impl str::FromStr for DummyHash256Hash {
type Err = &'static str;
fn from_str(x: &str) -> Result<DummyHash256, &'static str> {
fn from_str(x: &str) -> Result<DummyHash256Hash, &'static str> {
if x.is_empty() {
Ok(DummyHash256)
Ok(DummyHash256Hash)
} else {
Err("non empty dummy hash")
}
}
}

/// Dummy keyhash which de/serializes to the empty string; useful for testing
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Default)]
pub struct DummyRipemd160Hash;

impl str::FromStr for DummyRipemd160Hash {
Expand All @@ -511,7 +511,7 @@ impl str::FromStr for DummyRipemd160Hash {
}
}

impl fmt::Display for DummyHash256 {
impl fmt::Display for DummyHash256Hash {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("")
}
Expand All @@ -522,7 +522,7 @@ impl fmt::Display for DummyRipemd160Hash {
}
}

impl hash::Hash for DummyHash256 {
impl hash::Hash for DummyHash256Hash {
fn hash<H: hash::Hasher>(&self, state: &mut H) {
"DummySha256Hash".hash(state);
}
Expand All @@ -535,7 +535,7 @@ impl hash::Hash for DummyRipemd160Hash {
}

/// Dummy keyhash which de/serializes to the empty string; useful for testing
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug)]
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Default)]
pub struct DummyHash160Hash;

impl str::FromStr for DummyHash160Hash {
Expand Down