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 #325 from TheBlueMatt/2019-03-322-cleanup
[rust-lightning]
/
src
/
util
/
test_utils.rs
diff --git
a/src/util/test_utils.rs
b/src/util/test_utils.rs
index b889e254eb47557df5d1055f9fb2b86811d30654..b9c12a0761e58616e6c9a6c804479409e39fc6b3 100644
(file)
--- a/
src/util/test_utils.rs
+++ b/
src/util/test_utils.rs
@@
-12,7
+12,7
@@
use util::ser::{ReadableArgs, Writer};
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
use bitcoin::blockdata::transaction::Transaction;
use bitcoin::blockdata::script::Script;
-use bitcoin
::util::hash::
Sha256dHash;
+use bitcoin
_hashes::sha256d::Hash as
Sha256dHash;
use bitcoin::network::constants::Network;
use secp256k1::{SecretKey, PublicKey};
use bitcoin::network::constants::Network;
use secp256k1::{SecretKey, PublicKey};
@@
-215,6
+215,7
@@
impl Logger for TestLogger {
pub struct TestKeysInterface {
backing: keysinterface::KeysManager,
pub override_session_priv: Mutex<Option<SecretKey>>,
pub struct TestKeysInterface {
backing: keysinterface::KeysManager,
pub override_session_priv: Mutex<Option<SecretKey>>,
+ pub override_channel_id_priv: Mutex<Option<[u8; 32]>>,
}
impl keysinterface::KeysInterface for TestKeysInterface {
}
impl keysinterface::KeysInterface for TestKeysInterface {
@@
-229,6
+230,13
@@
impl keysinterface::KeysInterface for TestKeysInterface {
None => self.backing.get_session_key()
}
}
None => self.backing.get_session_key()
}
}
+
+ fn get_channel_id(&self) -> [u8; 32] {
+ match *self.override_channel_id_priv.lock().unwrap() {
+ Some(key) => key.clone(),
+ None => self.backing.get_channel_id()
+ }
+ }
}
impl TestKeysInterface {
}
impl TestKeysInterface {
@@
-236,6
+244,7
@@
impl TestKeysInterface {
Self {
backing: keysinterface::KeysManager::new(seed, network, logger),
override_session_priv: Mutex::new(None),
Self {
backing: keysinterface::KeysManager::new(seed, network, logger),
override_session_priv: Mutex::new(None),
+ override_channel_id_priv: Mutex::new(None),
}
}
}
}
}
}