add --extra-debug option to history

This commit is contained in:
Florian Dold 2020-03-28 00:18:25 +05:30
parent 131d2b34d9
commit c9012cbd4c
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
4 changed files with 28 additions and 10 deletions

View File

@ -188,7 +188,7 @@ export async function runIntegrationTest(args: IntegrationTestArgs) {
await myWallet.runUntilDone();
const history = await myWallet.getHistory({ verboseDetails: true });
const history = await myWallet.getHistory({ extraDebug: true });
console.log(
"history after integration test:",
@ -323,7 +323,7 @@ export async function runIntegrationTestBasic(cfg: Configuration) {
await myWallet.runUntilDone();
const history = await myWallet.getHistory({ verboseDetails: true });
const history = await myWallet.getHistory({ extraDebug: true });
console.log(
"history after integration test:",

View File

@ -135,8 +135,7 @@ const walletCli = clk
"Inhibit running certain operations, useful for debugging and testing.",
})
.flag("noThrottle", ["--no-throttle"], {
help:
"Don't do any request throttling.",
help: "Don't do any request throttling.",
})
.flag("version", ["-v", "--version"], {
onPresentHandler: printVersion,
@ -206,9 +205,12 @@ walletCli
.maybeOption("to", ["--to"], clk.STRING)
.maybeOption("limit", ["--limit"], clk.STRING)
.maybeOption("contEvt", ["--continue-with"], clk.STRING)
.flag("extraDebug", ["--extra-debug"])
.action(async (args) => {
await withWallet(args, async (wallet) => {
const history = await wallet.getHistory();
const history = await wallet.getHistory({
extraDebug: args.history.extraDebug,
});
if (args.history.json) {
console.log(JSON.stringify(history, undefined, 2));
} else {
@ -403,7 +405,7 @@ advancedCli
});
});
const coinPubListCodec = makeCodecForList(codecForString);
const coinPubListCodec = makeCodecForList(codecForString);
advancedCli
.subcommand("suspendCoins", "suspend-coins", {

View File

@ -218,7 +218,7 @@ export async function getHistory(
});
let verboseDetails: VerboseWithdrawDetails | undefined = undefined;
if (historyQuery?.verboseDetails) {
if (historyQuery?.extraDebug) {
verboseDetails = {
coins: cs.map((x) => ({
value: Amounts.toString(x.coinValue),
@ -260,7 +260,7 @@ export async function getHistory(
return;
}
let verboseDetails: VerbosePayCoinDetails | undefined = undefined;
if (historyQuery?.verboseDetails) {
if (historyQuery?.extraDebug) {
const coins: {
value: string,
contribution: string;
@ -337,7 +337,7 @@ export async function getHistory(
amountRefreshedEffective = Amounts.sum(amountsEffective).amount;
}
let verboseDetails: VerboseRefreshDetails | undefined = undefined;
if (historyQuery?.verboseDetails) {
if (historyQuery?.extraDebug) {
const outputCoins: {
value: string;
denomPub: string,
@ -488,11 +488,19 @@ export async function getHistory(
tx.iter(Stores.recoupGroups).forEach(rg => {
if (rg.timestampFinished) {
let verboseDetails: any = undefined;
if (historyQuery?.extraDebug) {
verboseDetails = {
oldAmountPerCoin: rg.oldAmountPerCoin.map(Amounts.toString),
};
}
history.push({
type: HistoryEventType.FundsRecouped,
timestamp: rg.timestampFinished,
eventId: makeEventId(HistoryEventType.FundsRecouped, rg.recoupGroupId),
numCoinsRecouped: rg.coinPubs.length,
verboseDetails,
});
}
});

View File

@ -18,6 +18,9 @@
* Type and schema definitions for the wallet's history.
*/
/**
* Imports.
*/
import { RefreshReason } from "./walletTypes";
import { ReserveTransaction } from "./ReserveTransaction";
import { WithdrawalSource } from "./dbTypes";
@ -647,6 +650,11 @@ export interface HistoryEventBase {
* on the event (e.g. hiding it from the history).
*/
eventId: string;
/**
* Extra details for debugging.
*/
verboseDetails?: any;
}
/**
@ -685,5 +693,5 @@ export interface HistoryQuery {
* Output extra verbose details, intended for debugging
* and not for end users.
*/
verboseDetails?: boolean;
extraDebug?: boolean;
}