use bitcoin::hashes::Hash as TraitImport;
use bitcoin::hashes::HashEngine as TraitImportEngine;
-use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::hash160::Hash as Hash160;
-use bitcoin::hashes::sha256d::Hash as Sha256dHash;
+use bitcoin::hashes::sha256::Hash as Sha256;
+use bitcoin::hash_types::{Txid, BlockHash};
use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,ChainListener,FeeEstimator,ChainWatchInterfaceUtil};
use lightning::chain::transaction::OutPoint;
use utils::test_logger;
-use secp256k1::key::{PublicKey,SecretKey};
-use secp256k1::Secp256k1;
+use bitcoin::secp256k1::key::{PublicKey,SecretKey};
+use bitcoin::secp256k1::Secp256k1;
use std::cell::RefCell;
use std::collections::{HashMap, hash_map};
use std::cmp;
-use std::hash::Hash;
use std::sync::Arc;
use std::sync::atomic::{AtomicU64,AtomicUsize,Ordering};
}
}
impl<'a> Eq for Peer<'a> {}
-impl<'a> Hash for Peer<'a> {
+impl<'a> std::hash::Hash for Peer<'a> {
fn hash<H : std::hash::Hasher>(&self, h: &mut H) {
self.id.hash(h)
}
peers: &'a RefCell<[bool; 256]>,
funding_txn: Vec<Transaction>,
- txids_confirmed: HashMap<Sha256dHash, usize>,
- header_hashes: Vec<Sha256dHash>,
+ txids_confirmed: HashMap<Txid, usize>,
+ header_hashes: Vec<BlockHash>,
height: usize,
max_height: usize,
blocks_connected: u32,