aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-23 00:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

db: Make the db struct private and provide accessors instead

Browse Source 
We will soon generalize the DB, so directly reaching into the `struct db`
instance to talk to the sqlite3 connection is bad anyway. This increases
flexibility and allows us to tailor the actual implementation to the
underlying DB.

Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker
2019-07-23 20:45:06 +02:00
committed by Rusty Russell
parent 66a47d2761
commit 803007ecdf
6 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wallet/wallet.c
View File

@@ -200,7 +200,7 @@ bool wallet_update_output_status(struct wallet *w,
sqlite3_bind_int(stmt, 3, outnum);
}
db_exec_prepared(w->db, stmt);
return sqlite3_changes(w->db->sql) > 0;
return db_changes(w->db) > 0;
}
struct utxo **wallet_get_utxos(const tal_t *ctx, struct wallet *w, const enum output_status state)
@@ -546,7 +546,7 @@ static void wallet_shachain_init(struct wallet *wallet,
sqlite3_bind_int64(stmt, 1, chain->chain.min_index);
db_exec_prepared(wallet->db, stmt);
chain->id = sqlite3_last_insert_rowid(wallet->db->sql);
chain->id = db_last_insert_id(wallet->db);
}
/* TODO(cdecker) Stolen from shachain, move to some appropriate location */
@@ -1067,7 +1067,7 @@ static void wallet_channel_config_insert(struct wallet *w,
stmt = db_prepare(w->db, "INSERT INTO channel_configs DEFAULT VALUES;");
db_exec_prepared(w->db, stmt);
cc->id = sqlite3_last_insert_rowid(w->db->sql);
cc->id = db_last_insert_id(w->db);
}
static void wallet_channel_config_save(struct wallet *w,
@@ -1293,7 +1293,7 @@ void wallet_channel_insert(struct wallet *w, struct channel *chan)
type_to_string(tmpctx, struct wireaddr_internal, &chan->peer->addr),
-1, SQLITE_TRANSIENT);
db_exec_prepared(w->db, stmt);
chan->peer->dbid = sqlite3_last_insert_rowid(w->db->sql);
chan->peer->dbid = db_last_insert_id(w->db);
}
/* Insert a stub, that we update, unifies INSERT and UPDATE paths */
@@ -1512,7 +1512,7 @@ void wallet_htlc_save_in(struct wallet *wallet,
sqlite3_bind_timeabs(stmt, 11, in->received_time);
db_exec_prepared(wallet->db, stmt);
in->dbid = sqlite3_last_insert_rowid(wallet->db->sql);
in->dbid = db_last_insert_id(wallet->db);
}
void wallet_htlc_save_out(struct wallet *wallet,
@@ -1562,7 +1562,7 @@ void wallet_htlc_save_out(struct wallet *wallet,
db_exec_prepared(wallet->db, stmt);
out->dbid = sqlite3_last_insert_rowid(wallet->db->sql);
out->dbid = db_last_insert_id(wallet->db);
}
void wallet_htlc_update(struct wallet *wallet, const u64 htlc_dbid,
@@ -2518,7 +2518,7 @@ wallet_outpoint_spend(struct wallet *w, const tal_t *ctx, const u32 blockheight,
db_exec_prepared(w->db, stmt);
if (sqlite3_changes(w->db->sql) == 0) {
if (db_changes(w->db) == 0) {
return NULL;
}