projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2100 from douglaz/docs_fixes
[rust-lightning]
/
lightning-block-sync
/
src
/
lib.rs
diff --git
a/lightning-block-sync/src/lib.rs
b/lightning-block-sync/src/lib.rs
index 5d8bc27f8d141c2dcaaad9f1f53f97a25daa1cb0..5c7c0dee8c10c4dddaf3ea630238db5e59387650 100644
(file)
--- a/
lightning-block-sync/src/lib.rs
+++ b/
lightning-block-sync/src/lib.rs
@@
-98,7
+98,7
@@
pub struct BlockSourceError {
}
/// The kind of `BlockSourceError`, either persistent or transient.
}
/// The kind of `BlockSourceError`, either persistent or transient.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq
, Eq
)]
pub enum BlockSourceErrorKind {
/// Indicates an error that won't resolve when retrying a request (e.g., invalid data).
Persistent,
pub enum BlockSourceErrorKind {
/// Indicates an error that won't resolve when retrying a request (e.g., invalid data).
Persistent,
@@
-132,6
+132,9
@@
impl BlockSourceError {
}
/// Converts the error into the underlying error.
}
/// Converts the error into the underlying error.
+ ///
+ /// May contain an [`std::io::Error`] from the [`BlockSource`]. See implementations for further
+ /// details, if any.
pub fn into_inner(self) -> Box<dyn std::error::Error + Send + Sync> {
self.error
}
pub fn into_inner(self) -> Box<dyn std::error::Error + Send + Sync> {
self.error
}
@@
-139,7
+142,7
@@
impl BlockSourceError {
/// A block header and some associated data. This information should be available from most block
/// sources (and, notably, is available in Bitcoin Core's RPC and REST interfaces).
/// A block header and some associated data. This information should be available from most block
/// sources (and, notably, is available in Bitcoin Core's RPC and REST interfaces).
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq
, Eq
)]
pub struct BlockHeaderData {
/// The block header itself.
pub header: BlockHeader,
pub struct BlockHeaderData {
/// The block header itself.
pub header: BlockHeader,
@@
-411,15
+414,15
@@
impl<'a, C: Cache, L: Deref> ChainNotifier<'a, C, L> where L::Target: chain::Lis
let height = header.height;
let block_data = chain_poller
.fetch_block(&header).await
let height = header.height;
let block_data = chain_poller
.fetch_block(&header).await
- .
or_else(|e| Err((e, Some(new_tip)
)))?;
+ .
map_err(|e| (e, Some(new_tip
)))?;
debug_assert_eq!(block_data.block_hash, header.block_hash);
match block_data.deref() {
BlockData::FullBlock(block) => {
debug_assert_eq!(block_data.block_hash, header.block_hash);
match block_data.deref() {
BlockData::FullBlock(block) => {
- self.chain_listener.block_connected(
&
block, height);
+ self.chain_listener.block_connected(block, height);
},
BlockData::HeaderOnly(header) => {
},
BlockData::HeaderOnly(header) => {
- self.chain_listener.filtered_block_connected(
&
header, &[], height);
+ self.chain_listener.filtered_block_connected(header, &[], height);
},
}
},
}