df-rbf: order inflights by funding_feerate

When we re-populate from disk, we need to know what order to recreate the inflights list in. Fixes ElementsProject#4511
niftynei · May 18, 2021 · 7464fec · 7464fec
1 parent a67e5ff
commit 7464fec
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 106 deletions.
diff --git a/tests/test_opening.py b/tests/test_opening.py
@@ -696,7 +696,6 @@ def test_rbf_no_overlap(node_factory, bitcoind, chainparams):
 
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
 @pytest.mark.openchannel('v2')
-@pytest.mark.xfail
 def test_rbf_fails_to_broadcast(node_factory, bitcoind, chainparams):
     l1, l2 = node_factory.get_nodes(2,
                                     opts={'allow_warning': True})

diff --git a/wallet/db_postgres_sqlgen.c b/wallet/db_postgres_sqlgen.c
diff --git a/wallet/db_sqlite3_sqlgen.c b/wallet/db_sqlite3_sqlgen.c