Connectd demux part 2

tests/test_closing.py

@@ -3438,6 +3438,7 @@ def test_closing_higherfee(node_factory, bitcoind, executor):
 @pytest.mark.developer("needs dev_disconnect")
 def test_htlc_rexmit_while_closing(node_factory, executor):
     """Retranmitting an HTLC revocation while shutting down should work"""
+    # FIXME: This should be in lnprototest!  UNRELIABLE.
     # l1 disconnects after sending second COMMITMENT_SIGNED.
     # Then it stops receiving after sending WIRE_SHUTDOWN (which is before it
     # reads the revoke_and_ack).

tests/test_pay.py

@@ -3630,6 +3630,16 @@ def test_mpp_adaptive(node_factory, bitcoind):
     assert(c12['spendable_msat'].millisatoshis < amt)
     assert(c34['spendable_msat'].millisatoshis < amt)
 
+    # Make sure all HTLCs entirely resolved before we mine more blocks!
+    def all_htlcs(n):
+        htlcs = []
+        for p in n.rpc.listpeers()['peers']:
+            for c in p['channels']:
+                htlcs += c['htlcs']
+        return htlcs
+
+    wait_for(lambda: all([all_htlcs(n) == [] for n in [l1, l2, l3, l4]]))
+
     mine_funding_to_announce(bitcoind, [l1, l2, l3, l4])
     wait_for(lambda: len(l1.rpc.listchannels()['channels']) == 8)