X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-block-sync%2Fsrc%2Frest.rs;fp=lightning-block-sync%2Fsrc%2Frest.rs;h=f46e5e02eb2c03b03e717ffb53c706f67e7bf8d8;hb=c1938e8c9fb5d531dd735e889b2ab0f7bc8580b8;hp=2ddfed7dad84b12dc43d5ac318b31b223ca74051;hpb=15a5966fa24286ca805aea3a97e606b10c71543d;p=rust-lightning diff --git a/lightning-block-sync/src/rest.rs b/lightning-block-sync/src/rest.rs index 2ddfed7d..f46e5e02 100644 --- a/lightning-block-sync/src/rest.rs +++ b/lightning-block-sync/src/rest.rs @@ -1,10 +1,9 @@ //! Simple REST client implementation which implements [`BlockSource`] against a Bitcoin Core REST //! endpoint. -use crate::{BlockHeaderData, BlockSource, AsyncBlockSourceResult}; +use crate::{BlockData, BlockHeaderData, BlockSource, AsyncBlockSourceResult}; use crate::http::{BinaryResponse, HttpEndpoint, HttpClient, JsonResponse}; -use bitcoin::blockdata::block::Block; use bitcoin::hash_types::BlockHash; use bitcoin::hashes::hex::ToHex; @@ -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, BlockData> { Box::pin(async move { let resource_path = format!("block/{}.bin", header_hash.to_hex()); - Ok(self.request_resource::(&resource_path).await?) + Ok(BlockData::FullBlock(self.request_resource::(&resource_path).await?)) }) }