From efc5da9ad4195e2ac64e867095d96657cdac7a11 Mon Sep 17 00:00:00 2001 From: ZmnSCPxj Date: Fri, 23 Feb 2018 23:11:33 +0000 Subject: [PATCH] invoices: Use common code for loading r and rhash. --- wallet/invoices.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wallet/invoices.c b/wallet/invoices.c index c0fa5427a..22b642aa9 100644 --- a/wallet/invoices.c +++ b/wallet/invoices.c @@ -96,11 +96,9 @@ static void wallet_stmt2invoice_details(const tal_t *ctx, { dtl->state = sqlite3_column_int(stmt, 0); - assert(sqlite3_column_bytes(stmt, 1) == sizeof(struct preimage)); - memcpy(&dtl->r, sqlite3_column_blob(stmt, 1), sqlite3_column_bytes(stmt, 1)); + sqlite3_column_preimage(stmt, 1, &dtl->r); - assert(sqlite3_column_bytes(stmt, 2) == sizeof(struct sha256)); - memcpy(&dtl->rhash, sqlite3_column_blob(stmt, 2), sqlite3_column_bytes(stmt, 2)); + sqlite3_column_sha256(stmt, 2, &dtl->rhash); dtl->label = tal_strndup(ctx, sqlite3_column_blob(stmt, 3), sqlite3_column_bytes(stmt, 3));