wallet: remove migration code for old commando runes.

This migration was introduced in dccbccf (pre 23.08), so the only way they
would need this is if they migration straight from 23.05 to 25.02.  And then
the solution is to migration to a prior one first, but I'll bet good money
we never, ever see this message:

   Commando runes still present?  Migration removed in v25.02: call Rusty!

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

tests/test_runes.py

@@ -509,50 +509,6 @@ def test_rune_pay_amount(node_factory):
     assert res['valid'] is True
 
 
-@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "Depends on canned sqlite3 db")
-@unittest.skipIf(TEST_NETWORK != 'regtest', 'canned sqlite3 db is regtest')
-def test_commando_rune_migration(node_factory):
-    """Test migration from commando's datastore using db from test_commando_listrunes"""
-    l1 = node_factory.get_node(dbfile='commando_listrunes.sqlite3.xz',
-                               options={'database-upgrade': True})
-
-    # This happens really early in logs!
-    l1.daemon.logsearch_start = 0
-    l1.daemon.wait_for_logs(['Transferring commando rune to db: '] * 2)
-
-    # datastore should be empty:
-    assert l1.rpc.listdatastore(['commando']) == {'datastore': []}
-
-    # Should match commando results!
-    assert l1.rpc.showrunes() == {'runes': [{'rune':
-                                             'OSqc7ixY6F-gjcigBfxtzKUI54uzgFSA6YfBQoWGDV89MA==',
-                                             'unique_id': '0', 'restrictions':
-                                             [], 'restrictions_as_english': ''},
-                                            {'rune':
-                                             'geZmO6U7yqpHn-moaX93FVMVWrDRfSNY4AXx9ypLcqg9MQ==',
-                                             'unique_id': '1', 'restrictions':
-                                             [], 'restrictions_as_english': ''}]}
-
-
-@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "Depends on canned sqlite3 db")
-@unittest.skipIf(TEST_NETWORK != 'regtest', 'canned sqlite3 db is regtest')
-def test_commando_blacklist_migration(node_factory):
-    """Test migration from commando's datastore using db from test_commando_blacklist"""
-    l1 = node_factory.get_node(dbfile='commando_blacklist.sqlite3.xz',
-                               options={'database-upgrade': True})
-
-    # This happens really early in logs!
-    l1.daemon.logsearch_start = 0
-    l1.daemon.wait_for_logs(['Transferring commando blacklist to db: '] * 2)
-
-    # datastore should be empty:
-    assert l1.rpc.listdatastore(['commando']) == {'datastore': []}
-
-    # Should match commando results!
-    assert l1.rpc.blacklistrune() == {'blacklist': [{'start': 0, 'end': 6},
-                                                    {'start': 9, 'end': 9}]}
-
-
 def test_missing_method_or_nodeid(node_factory):
     """For v23.11 we realized that nodeid should not be required for checkrune, which means method (which followed it) could not be require either"""
     l1 = node_factory.get_node()

wallet/wallet.c

@@ -6269,65 +6269,16 @@ void wallet_delete_blacklist(struct wallet *wallet, const struct rune_blacklist
 
 void migrate_datastore_commando_runes(struct lightningd *ld, struct db *db)
 {
-	struct db_stmt *stmt;
-	const char **startkey, **k;
-	const u8 *data;
-	size_t max;
+	const char **startkey;
 
 	/* datastore routines expect a tal_arr */
 	startkey = tal_arr(tmpctx, const char *, 2);
-	startkey[0] = "commando";
-	startkey[1] = "runes";
-
-	for (stmt = db_datastore_first(tmpctx, db, startkey, &k, &data, NULL);
-	     stmt;
-	     stmt = db_datastore_next(tmpctx, stmt, startkey, &k, &data, NULL)) {
-		const char *err, *str;
-		struct rune *r;
-
-		str = db_col_strdup(tmpctx, stmt, "data");
-		r = rune_from_base64(tmpctx, str);
-		if (!r)
-			db_fatal(db, "Invalid commando rune %s", str);
-		err = rune_is_ours(ld, r);
-		if (err) {
-			log_unusual(ld->log,
-				    "Warning: removing commando"
-				    " rune %s (uid %s): %s",
-				    str, r->unique_id, err);
-		} else {
-			log_debug(ld->log, "Transferring commando rune to db: %s",
-				  str);
-			db_rune_insert(db, r);
-		}
-		db_datastore_remove(db, k);
-	}
-
-	/* Now convert blacklist */
-	startkey[0] = "commando";
-	startkey[1] = "blacklist";
-
-	data = db_datastore_get(tmpctx, db, startkey, NULL);
-	max = tal_bytelen(data);
-	while (max) {
-		struct rune_blacklist b;
-
-		b.start = fromwire_u64(&data, &max);
-		b.end = fromwire_u64(&data, &max);
-
-		if (!data)
-			db_fatal(db, "Invalid commando blacklist?");
-		log_debug(ld->log, "Transferring commando blacklist to db: %"PRIu64"-%"PRIu64,
-			  b.start, b.end);
-		db_insert_blacklist(db, &b);
-	}
-	db_datastore_remove(db, startkey);
 
-	/* Might as well clean up "rune_counter" while we're here, so
-	 * commando datastore is completely clean. */
+	/* We deleted this from the datastore on migration. */
 	startkey[0] = "commando";
 	startkey[1] = "rune_counter";
-	db_datastore_remove(db, startkey);
+	if (db_datastore_get(tmpctx, db, startkey, NULL))
+		db_fatal(db, "Commando runes still present?  Migration removed in v25.02: call Rusty!");
 }
 
 void migrate_runes_idfix(struct lightningd *ld, struct db *db)