Browse Source

utxo: remove unused scriptSig field.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
bump-pyln-proto
Rusty Russell 4 years ago
parent
commit
c1df8d586d
  1. 3
      common/utxo.c
  2. 3
      common/utxo.h
  3. 1
      wallet/wallet.c

3
common/utxo.c

@ -21,8 +21,6 @@ void towire_utxo(u8 **pptr, const struct utxo *utxo)
towire_u16(pptr, tal_count(utxo->scriptPubkey));
towire_u8_array(pptr, utxo->scriptPubkey, tal_count(utxo->scriptPubkey));
towire_u16(pptr, tal_count(utxo->scriptSig));
towire_u8_array(pptr, utxo->scriptSig, tal_count(utxo->scriptSig));
towire_bool(pptr, is_unilateral_close);
if (is_unilateral_close) {
@ -45,7 +43,6 @@ struct utxo *fromwire_utxo(const tal_t *ctx, const u8 **ptr, size_t *max)
utxo->is_p2sh = fromwire_bool(ptr, max);
utxo->scriptPubkey = fromwire_tal_arrn(utxo, ptr, max, fromwire_u16(ptr, max));
utxo->scriptSig = fromwire_tal_arrn(utxo, ptr, max, fromwire_u16(ptr, max));
if (fromwire_bool(ptr, max)) {
utxo->close_info = tal(utxo, struct unilateral_close_info);

3
common/utxo.h

@ -44,9 +44,6 @@ struct utxo {
/* The scriptPubkey if it is known */
u8 *scriptPubkey;
/* scriptSig. Only for P2SH outputs */
u8 *scriptSig;
};
void towire_utxo(u8 **pptr, const struct utxo *utxo);

1
wallet/wallet.c

@ -187,7 +187,6 @@ static struct utxo *wallet_stmt2output(const tal_t *ctx, struct db_stmt *stmt)
utxo->blockheight = NULL;
utxo->spendheight = NULL;
utxo->scriptSig = NULL;
utxo->reserved_til = NULL;
if (!db_column_is_null(stmt, 9)) {

Loading…
Cancel
Save