Skip to content

Commit f83a5c6

Browse files
authored
Merge pull request #72 from tnull/2023-04-fix-rebase
Fix quiet rebase conflict
2 parents 0a299f4 + ee613af commit f83a5c6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -864,8 +864,8 @@ impl Node {
864864
pub fn send_to_onchain_address(
865865
&self, address: &bitcoin::Address, amount_sats: u64,
866866
) -> Result<Txid, Error> {
867-
let runtime_lock = self.running.read().unwrap();
868-
if runtime_lock.is_none() {
867+
let rt_lock = self.runtime.read().unwrap();
868+
if rt_lock.is_none() {
869869
return Err(Error::NotRunning);
870870
}
871871

@@ -879,8 +879,8 @@ impl Node {
879879

880880
/// Send an on-chain payment to the given address, draining all the available funds.
881881
pub fn send_all_to_onchain_address(&self, address: &bitcoin::Address) -> Result<Txid, Error> {
882-
let runtime_lock = self.running.read().unwrap();
883-
if runtime_lock.is_none() {
882+
let rt_lock = self.runtime.read().unwrap();
883+
if rt_lock.is_none() {
884884
return Err(Error::NotRunning);
885885
}
886886

0 commit comments

Comments
 (0)