From 62067f0030795143cbec87dcc1d5db0e5265c5c5 Mon Sep 17 00:00:00 2001
From: Antoine Poinsot <darosior@protonmail.com>
Date: Mon, 5 Dec 2022 10:04:03 +0100
Subject: [PATCH 1/3] qa: remove needless import in fixtures

---
 tests/fixtures.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/fixtures.py b/tests/fixtures.py
index 1d5beaf5..2d46cb72 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -1,7 +1,6 @@
 from bip32 import BIP32
 from bip380.descriptors import Descriptor
 from concurrent import futures
-from ephemeral_port_reserve import reserve
 from test_framework.bitcoind import Bitcoind
 from test_framework.lianad import Lianad
 from test_framework.utils import (

From 628ed3d0ed3997a64d8d0d92206842ef5445e2fa Mon Sep 17 00:00:00 2001
From: Antoine Poinsot <darosior@protonmail.com>
Date: Mon, 5 Dec 2022 10:05:26 +0100
Subject: [PATCH 2/3] descriptors: remove TODO in assertions, explain instead

---
 src/descriptors.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/descriptors.rs b/src/descriptors.rs
index 2dc6e300..772ea959 100644
--- a/src/descriptors.rs
+++ b/src/descriptors.rs
@@ -338,12 +338,12 @@ impl MultipathDescriptor {
         }
 
         let owner_pk = Miniscript::from_ast(Terminal::Check(sync::Arc::from(
-            Miniscript::from_ast(Terminal::PkK(owner_key)).expect("TODO"),
+            Miniscript::from_ast(Terminal::PkK(owner_key)).expect("pk_k is a valid Miniscript"),
         )))
         .expect("Well typed");
 
         let heir_pkh = Miniscript::from_ast(Terminal::Check(sync::Arc::from(
-            Miniscript::from_ast(Terminal::PkH(heir_key)).expect("TODO"),
+            Miniscript::from_ast(Terminal::PkH(heir_key)).expect("pk_h is a valid Miniscript"),
         )))
         .expect("Well typed");
 

From a4e66566886901f28e383e67f06de2215e3ebc42 Mon Sep 17 00:00:00 2001
From: Antoine Poinsot <darosior@protonmail.com>
Date: Mon, 5 Dec 2022 11:17:27 +0100
Subject: [PATCH 3/3] daemon: remove / correct some TODOs

---
 src/bitcoin/d/utils.rs | 1 -
 src/commands/mod.rs    | 4 ++--
 src/config.rs          | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/bitcoin/d/utils.rs b/src/bitcoin/d/utils.rs
index e113d0b1..b6e2a330 100644
--- a/src/bitcoin/d/utils.rs
+++ b/src/bitcoin/d/utils.rs
@@ -86,7 +86,6 @@ mod tests {
 
     // Create a dummy BlockStats struct with the given time
     fn create_stats(time: u32) -> BlockStats {
-        // TODO
         BlockStats {
             height: 0,
             confirmations: 0,
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index 5b4ea22d..5ec14b98 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -571,7 +571,7 @@ impl DaemonControl {
         let transactions = txids
             .iter()
             .filter_map(|txid| {
-                // TODO: batch batch those calls to the Bitcoin backend
+                // TODO: batch those calls to the Bitcoin backend
                 // so it can in turn optimize its queries.
                 self.bitcoin
                     .wallet_transaction(txid)
@@ -590,7 +590,7 @@ impl DaemonControl {
         let transactions = txids
             .iter()
             .filter_map(|txid| {
-                // TODO: batch batch those calls to the Bitcoin backend
+                // TODO: batch those calls to the Bitcoin backend
                 // so it can in turn optimize its queries.
                 self.bitcoin
                     .wallet_transaction(txid)
diff --git a/src/config.rs b/src/config.rs
index 9e6b288d..111a438b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -48,7 +48,6 @@ fn default_daemon() -> bool {
     false
 }
 
-// TODO: separate Bitcoin config and bitcoind-specific config.
 /// Everything we need to know for talking to bitcoind serenely
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct BitcoindConfig {