wallet: make enum wallet_output_type UPPERCASE.

No code change, just following convention.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

wallet/db.c

@@ -1229,7 +1229,7 @@ void fillin_missing_scriptpubkeys(struct lightningd *ld, struct db *db)
 			db_col_ignore(stmt, "peer_id");
 			db_col_ignore(stmt, "commitment_point");
 			bip32_pubkey(ld, &key, keyindex);
-			if (type == p2sh_wpkh) {
+			if (type == WALLET_OUTPUT_P2SH_WPKH) {
 				u8 *redeemscript = bitcoin_redeem_p2sh_p2wpkh(stmt, &key);
 				scriptPubkey = scriptpubkey_p2sh(tmpctx, redeemscript);
 			} else

wallet/test/run-wallet.c

@@ -1385,12 +1385,12 @@ static bool test_wallet_outputs(struct lightningd *ld, const tal_t *ctx)
 	db_begin_transaction(w->db);
 
 	/* Should work, it's the first time we add it */
-	CHECK_MSG(wallet_add_utxo(w, &u, p2sh_wpkh),
+	CHECK_MSG(wallet_add_utxo(w, &u, WALLET_OUTPUT_P2SH_WPKH),
 		  "wallet_add_utxo failed on first add");
 	CHECK_MSG(!wallet_err, wallet_err);
 
 	/* Should fail, we already have that UTXO */
-	CHECK_MSG(!wallet_add_utxo(w, &u, p2sh_wpkh),
+	CHECK_MSG(!wallet_add_utxo(w, &u, WALLET_OUTPUT_P2SH_WPKH),
 		  "wallet_add_utxo succeeded on second add");
 	CHECK_MSG(!wallet_err, wallet_err);
 
@@ -1404,7 +1404,7 @@ static bool test_wallet_outputs(struct lightningd *ld, const tal_t *ctx)
 	/* Arbitrarily set scriptpubkey len to 20 */
 	u.scriptPubkey = tal_arr(w, u8, 20);
 	memset(u.scriptPubkey, 1, 20);
-	CHECK_MSG(wallet_add_utxo(w, &u, our_change),
+	CHECK_MSG(wallet_add_utxo(w, &u, WALLET_OUTPUT_OUR_CHANGE),
 		  "wallet_add_utxo with close_info");
 
 	/* Now select them */
@@ -1473,7 +1473,7 @@ static bool test_wallet_outputs(struct lightningd *ld, const tal_t *ctx)
 	u.blockheight = blockheight;
 	u.scriptPubkey = tal_arr(w, u8, 20);
 	memset(u.scriptPubkey, 1, 20);
-	CHECK_MSG(wallet_add_utxo(w, &u, p2sh_wpkh),
+	CHECK_MSG(wallet_add_utxo(w, &u, WALLET_OUTPUT_P2SH_WPKH),
 		  "wallet_add_utxo with close_info no commitment_point");
 	CHECK_MSG(!wallet_err, wallet_err);
 
@@ -1555,7 +1555,7 @@ static bool test_wallet_outputs(struct lightningd *ld, const tal_t *ctx)
 	memset(&u.outpoint, 4, sizeof(u.outpoint));
 	u.amount = AMOUNT_SAT(4);
 	u.close_info = tal_free(u.close_info);
-	CHECK_MSG(wallet_add_utxo(w, &u, p2wpkh),
+	CHECK_MSG(wallet_add_utxo(w, &u, WALLET_OUTPUT_P2WPKH),
 		  "wallet_add_utxo failed, p2wpkh");
 
 	utxos = tal_arr(w, const struct utxo *, 0);

wallet/wallet.c

@@ -363,7 +363,7 @@ static struct utxo *wallet_stmt2output(const tal_t *ctx, struct db_stmt *stmt)
 
 	utxo->scriptPubkey = db_col_arr(utxo, stmt, "scriptpubkey", u8);
 	/* FIXME: add p2tr to type? */
-	if (db_col_int(stmt, "type") == p2sh_wpkh)
+	if (wallet_output_type_in_db(db_col_int(stmt, "type")) == WALLET_OUTPUT_P2SH_WPKH)
 		utxo->utxotype = UTXO_P2SH_P2WPKH;
 	else if (is_p2wpkh(utxo->scriptPubkey, tal_bytelen(utxo->scriptPubkey), NULL))
 		utxo->utxotype = UTXO_P2WPKH;
@@ -896,7 +896,7 @@ bool wallet_add_onchaind_utxo(struct wallet *w,
 	db_bind_txid(stmt, &outpoint->txid);
 	db_bind_int(stmt, outpoint->n);
 	db_bind_amount_sat(stmt, &amount);
-	db_bind_int(stmt, wallet_output_type_in_db(p2wpkh));
+	db_bind_int(stmt, wallet_output_type_in_db(WALLET_OUTPUT_P2WPKH));
 	db_bind_int(stmt, OUTPUT_STATE_AVAILABLE);
 	db_bind_int(stmt, 0);
 	db_bind_u64(stmt, channel->dbid);
@@ -2987,7 +2987,7 @@ static void got_utxo(struct wallet *w,
 		notify_chain_mvt(w->ld, mvt);
 	}
 
-	if (!wallet_add_utxo(w, utxo, utxo->utxotype == UTXO_P2SH_P2WPKH ? p2sh_wpkh : our_change)) {
+	if (!wallet_add_utxo(w, utxo, utxo->utxotype == UTXO_P2SH_P2WPKH ? WALLET_OUTPUT_P2SH_WPKH : WALLET_OUTPUT_OUR_CHANGE)) {
 		/* In case we already know the output, make
 		 * sure we actually track its
 		 * blockheight. This can happen when we grab

wallet/wallet.h

@@ -82,34 +82,34 @@ static inline enum output_status output_status_in_db(enum output_status s)
 /* /!\ This is a DB ENUM, please do not change the numbering of any
  * already defined elements (adding is ok) /!\ */
 enum wallet_output_type {
-	p2sh_wpkh = 0,
-	to_local = 1,
-	htlc_offer = 3,
-	htlc_recv = 4,
-	our_change = 5,
-	p2wpkh = 6
+	WALLET_OUTPUT_P2SH_WPKH = 0,
+	WALLET_OUTPUT_TO_LOCAL = 1,
+	WALLET_OUTPUT_HTLC_OFFER = 3,
+	WALLET_OUTPUT_HTLC_RECV = 4,
+	WALLET_OUTPUT_OUR_CHANGE = 5,
+	WALLET_OUTPUT_P2WPKH = 6
 };
 
 static inline enum wallet_output_type wallet_output_type_in_db(enum wallet_output_type w)
 {
 	switch (w) {
-	case p2sh_wpkh:
-		BUILD_ASSERT(p2sh_wpkh == 0);
+	case WALLET_OUTPUT_P2SH_WPKH:
+		BUILD_ASSERT(WALLET_OUTPUT_P2SH_WPKH == 0);
 		return w;
-	case to_local:
-		BUILD_ASSERT(to_local == 1);
+	case WALLET_OUTPUT_TO_LOCAL:
+		BUILD_ASSERT(WALLET_OUTPUT_TO_LOCAL == 1);
 		return w;
-	case htlc_offer:
-		BUILD_ASSERT(htlc_offer == 3);
+	case WALLET_OUTPUT_HTLC_OFFER:
+		BUILD_ASSERT(WALLET_OUTPUT_HTLC_OFFER == 3);
 		return w;
-	case htlc_recv:
-		BUILD_ASSERT(htlc_recv == 4);
+	case WALLET_OUTPUT_HTLC_RECV:
+		BUILD_ASSERT(WALLET_OUTPUT_HTLC_RECV == 4);
 		return w;
-	case our_change:
-		BUILD_ASSERT(our_change == 5);
+	case WALLET_OUTPUT_OUR_CHANGE:
+		BUILD_ASSERT(WALLET_OUTPUT_OUR_CHANGE == 5);
 		return w;
-	case p2wpkh:
-		BUILD_ASSERT(p2wpkh == 6);
+	case WALLET_OUTPUT_P2WPKH:
+		BUILD_ASSERT(WALLET_OUTPUT_P2WPKH == 6);
 		return w;
 	}
 	fatal("%s: %u is invalid", __func__, w);