projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support spontaneous payment retries in ChannelManager
[rust-lightning]
/
lightning-block-sync
/
src
/
rest.rs
diff --git
a/lightning-block-sync/src/rest.rs
b/lightning-block-sync/src/rest.rs
index 2ddfed7dad84b12dc43d5ac318b31b223ca74051..c73b23b600c2925e3e0a085a99fc75560527f064 100644
(file)
--- a/
lightning-block-sync/src/rest.rs
+++ b/
lightning-block-sync/src/rest.rs
@@
-1,14
+1,13
@@
//! Simple REST client implementation which implements [`BlockSource`] against a Bitcoin Core REST
//! endpoint.
//! Simple REST client implementation which implements [`BlockSource`] against a Bitcoin Core REST
//! endpoint.
-use crate::{BlockHeaderData, BlockSource, AsyncBlockSourceResult};
+use crate::{Block
Data, Block
HeaderData, BlockSource, AsyncBlockSourceResult};
use crate::http::{BinaryResponse, HttpEndpoint, HttpClient, JsonResponse};
use crate::http::{BinaryResponse, HttpEndpoint, HttpClient, JsonResponse};
-use bitcoin::blockdata::block::Block;
use bitcoin::hash_types::BlockHash;
use bitcoin::hashes::hex::ToHex;
use bitcoin::hash_types::BlockHash;
use bitcoin::hashes::hex::ToHex;
-use futures::lock::Mutex;
+use futures
_util
::lock::Mutex;
use std::convert::TryFrom;
use std::convert::TryInto;
use std::convert::TryFrom;
use std::convert::TryInto;
@@
-45,10
+44,10
@@
impl BlockSource for RestClient {
})
}
})
}
- fn get_block<'a>(&'a self, header_hash: &'a BlockHash) -> AsyncBlockSourceResult<'a, Block> {
+ fn get_block<'a>(&'a self, header_hash: &'a BlockHash) -> AsyncBlockSourceResult<'a, Block
Data
> {
Box::pin(async move {
let resource_path = format!("block/{}.bin", header_hash.to_hex());
Box::pin(async move {
let resource_path = format!("block/{}.bin", header_hash.to_hex());
- Ok(
self.request_resource::<BinaryResponse, _>(&resource_path).await?
)
+ Ok(
BlockData::FullBlock(self.request_resource::<BinaryResponse, _>(&resource_path).await?)
)
})
}
})
}