projects
/
ldk-sample
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to LDK 0.0.121
[ldk-sample]
/
src
/
convert.rs
diff --git
a/src/convert.rs
b/src/convert.rs
index 7f1bf108828753df82a0a754e82c22bc332a8664..686761fffdc97b138361c5b251298e1e628f2596 100644
(file)
--- a/
src/convert.rs
+++ b/
src/convert.rs
@@
-1,4
+1,3
@@
-use bitcoin::hashes::hex::FromHex;
use bitcoin::{Address, BlockHash, Txid};
use lightning_block_sync::http::JsonResponse;
use std::convert::TryInto;
use bitcoin::{Address, BlockHash, Txid};
use lightning_block_sync::http::JsonResponse;
use std::convert::TryInto;
@@
-111,7
+110,7
@@
impl TryInto<BlockchainInfo> for JsonResponse {
fn try_into(self) -> std::io::Result<BlockchainInfo> {
Ok(BlockchainInfo {
latest_height: self.0["blocks"].as_u64().unwrap() as usize,
fn try_into(self) -> std::io::Result<BlockchainInfo> {
Ok(BlockchainInfo {
latest_height: self.0["blocks"].as_u64().unwrap() as usize,
- latest_blockhash: BlockHash::from_
hex
(self.0["bestblockhash"].as_str().unwrap())
+ latest_blockhash: BlockHash::from_
str
(self.0["bestblockhash"].as_str().unwrap())
.unwrap(),
chain: self.0["chain"].as_str().unwrap().to_string(),
})
.unwrap(),
chain: self.0["chain"].as_str().unwrap().to_string(),
})
@@
-141,7
+140,9
@@
impl TryInto<ListUnspentResponse> for JsonResponse {
amount: bitcoin::Amount::from_btc(utxo["amount"].as_f64().unwrap())
.unwrap()
.to_sat(),
amount: bitcoin::Amount::from_btc(utxo["amount"].as_f64().unwrap())
.unwrap()
.to_sat(),
- address: Address::from_str(&utxo["address"].as_str().unwrap().to_string()).unwrap(),
+ address: Address::from_str(&utxo["address"].as_str().unwrap().to_string())
+ .unwrap()
+ .assume_checked(), // the expected network is not known at this point
})
.collect();
Ok(ListUnspentResponse(utxos))
})
.collect();
Ok(ListUnspentResponse(utxos))