mirror of
https://github.com/jwinterm/grin-wallet.git
synced 2026-11-22 15:13:57 +01:00
Merge upstream staging (#755 multi-LMDB backend) into contracts
Reconcile the contract feature with #755, which replaced the WalletBackend trait with a concrete WalletBackend<C,K> struct (libwallet/src/backend.rs) and removed impls/src/backends/lmdb.rs. - Port the contract module and contract API entry points from the trait form (T: WalletBackend<'a,C,K>) to the concrete struct. - Re-home next_child_for and a parent_id+log_id get_tx_log_entry onto backend.rs. - Re-apply the self-spend tx-log filters, cancel-loop, v5 payment-proof fields, and Context contract fields onto staging's rewritten files. - Adapt to fallible iter()/tx_log_iter() and self-consuming batch commit. Full suite green (53 binaries / 191 tests).
This commit is contained in:
@@ -152,6 +152,7 @@ pub fn txs(
|
||||
table.set_titles(row![
|
||||
bMG->"Id",
|
||||
bMG->"Type",
|
||||
bMG->"State",
|
||||
bMG->"Shared Transaction Id",
|
||||
bMG->"Creation Time",
|
||||
bMG->"TTL Cutoff Height",
|
||||
@@ -174,6 +175,10 @@ pub fn txs(
|
||||
Some(m) => format!("{}", m),
|
||||
None => "None".to_owned(),
|
||||
};
|
||||
let slate_state = match t.tx_slate_state.as_ref() {
|
||||
Some(m) => format!("{}", m),
|
||||
None => "None".to_owned(),
|
||||
};
|
||||
let entry_type = format!("{}", t.tx_type);
|
||||
let creation_ts = format!("{}", t.creation_ts.format("%Y-%m-%d %H:%M:%S"));
|
||||
let ttl_cutoff_height = match t.ttl_cutoff_height {
|
||||
@@ -220,6 +225,7 @@ pub fn txs(
|
||||
table.add_row(row![
|
||||
bFC->id,
|
||||
bFC->entry_type,
|
||||
bFC->slate_state,
|
||||
bFC->slate_id,
|
||||
bFB->creation_ts,
|
||||
bFB->ttl_cutoff_height,
|
||||
|
||||
Reference in New Issue
Block a user