projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct `outbound_payment` route-fetch calls to pass the hash + ID
[rust-lightning]
/
lightning-block-sync
/
src
/
poll.rs
diff --git
a/lightning-block-sync/src/poll.rs
b/lightning-block-sync/src/poll.rs
index 1243d004aae7a2b56f8ac851624ab0c531f326eb..05ccd4504fde0d81a76646d91b44d9b2b1653711 100644
(file)
--- a/
lightning-block-sync/src/poll.rs
+++ b/
lightning-block-sync/src/poll.rs
@@
-1,8
+1,7
@@
//! Adapters that make one or more [`BlockSource`]s simpler to poll for new chain tip transitions.
//! Adapters that make one or more [`BlockSource`]s simpler to poll for new chain tip transitions.
-use crate::{AsyncBlockSourceResult, BlockHeaderData, BlockSource, BlockSourceError, BlockSourceResult};
+use crate::{AsyncBlockSourceResult, Block
Data, Block
HeaderData, BlockSource, BlockSourceError, BlockSourceResult};
-use bitcoin::blockdata::block::Block;
use bitcoin::hash_types::BlockHash;
use bitcoin::network::constants::Network;
use lightning::chain::BestBlock;
use bitcoin::hash_types::BlockHash;
use bitcoin::network::constants::Network;
use lightning::chain::BestBlock;
@@
-31,7
+30,7
@@
pub trait Poll {
}
/// A chain tip relative to another chain tip in terms of block hash and chainwork.
}
/// A chain tip relative to another chain tip in terms of block hash and chainwork.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq
, Eq
)]
pub enum ChainTip {
/// A chain tip with the same hash as another chain's tip.
Common,
pub enum ChainTip {
/// A chain tip with the same hash as another chain's tip.
Common,
@@
-72,24
+71,31
@@
impl Validate for BlockHeaderData {
}
}
}
}
-impl Validate for Block {
+impl Validate for Block
Data
{
type T = ValidatedBlock;
fn validate(self, block_hash: BlockHash) -> BlockSourceResult<Self::T> {
type T = ValidatedBlock;
fn validate(self, block_hash: BlockHash) -> BlockSourceResult<Self::T> {
- let pow_valid_block_hash = self.header
- .validate_pow(&self.header.target())
+ let header = match &self {
+ BlockData::FullBlock(block) => &block.header,
+ BlockData::HeaderOnly(header) => header,
+ };
+
+ let pow_valid_block_hash = header
+ .validate_pow(&header.target())
.or_else(|e| Err(BlockSourceError::persistent(e)))?;
if pow_valid_block_hash != block_hash {
return Err(BlockSourceError::persistent("invalid block hash"));
}
.or_else(|e| Err(BlockSourceError::persistent(e)))?;
if pow_valid_block_hash != block_hash {
return Err(BlockSourceError::persistent("invalid block hash"));
}
- if !self.check_merkle_root() {
- return Err(BlockSourceError::persistent("invalid merkle root"));
- }
+ if let BlockData::FullBlock(block) = &self {
+ if !block.check_merkle_root() {
+ return Err(BlockSourceError::persistent("invalid merkle root"));
+ }
- if !self.check_witness_commitment() {
- return Err(BlockSourceError::persistent("invalid witness commitment"));
+ if !block.check_witness_commitment() {
+ return Err(BlockSourceError::persistent("invalid witness commitment"));
+ }
}
Ok(ValidatedBlock { block_hash, inner: self })
}
Ok(ValidatedBlock { block_hash, inner: self })
@@
-97,7
+103,7
@@
impl Validate for Block {
}
/// A block header with validated proof of work and corresponding block hash.
}
/// A block header with validated proof of work and corresponding block hash.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq
, Eq
)]
pub struct ValidatedBlockHeader {
pub(crate) block_hash: BlockHash,
inner: BlockHeaderData,
pub struct ValidatedBlockHeader {
pub(crate) block_hash: BlockHash,
inner: BlockHeaderData,
@@
-159,11
+165,11
@@
impl ValidatedBlockHeader {
/// A block with validated data against its transaction list and corresponding block hash.
pub struct ValidatedBlock {
pub(crate) block_hash: BlockHash,
/// A block with validated data against its transaction list and corresponding block hash.
pub struct ValidatedBlock {
pub(crate) block_hash: BlockHash,
- inner: Block,
+ inner: Block
Data
,
}
impl std::ops::Deref for ValidatedBlock {
}
impl std::ops::Deref for ValidatedBlock {
- type Target = Block;
+ type Target = Block
Data
;
fn deref(&self) -> &Self::Target {
&self.inner
fn deref(&self) -> &Self::Target {
&self.inner
@@
-175,7
+181,7
@@
mod sealed {
pub trait Validate {}
impl Validate for crate::BlockHeaderData {}
pub trait Validate {}
impl Validate for crate::BlockHeaderData {}
- impl Validate for
bitcoin::blockdata::block::Block
{}
+ impl Validate for
crate::BlockData
{}
}
/// The canonical `Poll` implementation used for a single `BlockSource`.
}
/// The canonical `Poll` implementation used for a single `BlockSource`.