Skip to content

Implement to and from for PublicKey and NodeId #2180

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
Apr 14, 2023
Merged

Implement to and from for PublicKey and NodeId #2180

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed6732
Implement to and from for PublicKey and NodeId
benthecarman Apr 13, 2023
7a37e2c
Impl FromStr for NodeId
benthecarman Apr 13, 2023
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
31 changes: 31 additions & 0 deletions lightning/src/routing/gossip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use bitcoin::secp256k1;

use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hashes::Hash;
use bitcoin::hashes::hex::FromHex;
use bitcoin::hash_types::BlockHash;

use bitcoin::network::constants::Network;
Expand All @@ -38,11 +39,13 @@ use crate::io;
use crate::io_extras::{copy, sink};
use crate::prelude::*;
use core::{cmp, fmt};
use core::convert::TryFrom;
use crate::sync::{RwLock, RwLockReadGuard};
#[cfg(feature = "std")]
use core::sync::atomic::{AtomicUsize, Ordering};
use crate::sync::Mutex;
use core::ops::{Bound, Deref};
use core::str::FromStr;

#[cfg(feature = "std")]
use std::time::{SystemTime, UNIX_EPOCH};
Expand Down Expand Up @@ -76,6 +79,11 @@ impl NodeId {
pub fn as_slice(&self) -> &[u8] {
&self.0
}

/// Get the public key from this NodeId
pub fn as_pubkey(&self) -> Result<PublicKey, secp256k1::Error> {
PublicKey::from_slice(&self.0)
}
}

impl fmt::Debug for NodeId {
Expand Down Expand Up @@ -130,6 +138,29 @@ impl Readable for NodeId {
}
}

impl From<PublicKey> for NodeId {
fn from(pubkey: PublicKey) -> Self {
Self::from_pubkey(&pubkey)
}
}

impl TryFrom<NodeId> for PublicKey {
type Error = secp256k1::Error;

fn try_from(node_id: NodeId) -> Result<Self, Self::Error> {
node_id.as_pubkey()
}
}

impl FromStr for NodeId {
type Err = bitcoin::hashes::hex::Error;

fn from_str(s: &str) -> Result<Self, Self::Err> {
let data: [u8; PUBLIC_KEY_SIZE] = FromHex::from_hex(s)?;
Ok(NodeId(data))
}
}

/// Represents the network as nodes and channels between them
pub struct NetworkGraph<L: Deref> where L::Target: Logger {
secp_ctx: Secp256k1<secp256k1::VerifyOnly>,
Expand Down