Update Merkle integration tests and channel index cleanup

src/routing_layer/topo_node_sqlite.c

@@ -502,7 +502,7 @@ int topo_node_sqlite_channel_delete(sqlite3* db, const char* channel_id) {
 
     /* 3. delete merkle tree hashes for this namespace */
     sqlite3_stmt* mh = NULL;
-    if (sqlite3_prepare_v2(db, "DELETE FROM merkle_tree_hash WHERE namespace=?", -1, &mh, NULL) == SQLITE_OK) {
+    if (sqlite3_prepare_v2(db, "DELETE FROM merkle_tree_hash WHERE substr(namespace,instr(namespace,':')+1)=?", -1, &mh, NULL) == SQLITE_OK) {
         sqlite3_bind_text(mh, 1, channel_id, -1, SQLITE_STATIC);
         sqlite3_step(mh);
         sqlite3_finalize(mh);