Ensure that only purely wallet-internal tx are returned as internal.
Co-authored-by: Jack Grigg <jack@electriccoin.co>
This commit is contained in:
parent
e6f039d0f9
commit
5a2f659594
|
@ -454,7 +454,7 @@ mod tests {
|
||||||
notes.raw,
|
notes.raw,
|
||||||
SUM(notes.value) + MAX(notes.fee) AS net_value,
|
SUM(notes.value) + MAX(notes.fee) AS net_value,
|
||||||
MAX(notes.fee) AS fee_paid,
|
MAX(notes.fee) AS fee_paid,
|
||||||
SUM(notes.is_wallet_internal) > 0 AS is_wallet_internal,
|
SUM(notes.sent_count) == 0 AS is_wallet_internal,
|
||||||
SUM(notes.is_change) > 0 AS has_change,
|
SUM(notes.is_change) > 0 AS has_change,
|
||||||
SUM(notes.sent_count) AS sent_note_count,
|
SUM(notes.sent_count) AS sent_note_count,
|
||||||
SUM(notes.received_count) AS received_note_count,
|
SUM(notes.received_count) AS received_note_count,
|
||||||
|
@ -472,7 +472,7 @@ mod tests {
|
||||||
WHEN received_notes.is_change THEN 0
|
WHEN received_notes.is_change THEN 0
|
||||||
ELSE value
|
ELSE value
|
||||||
END AS value,
|
END AS value,
|
||||||
0 AS is_wallet_internal,
|
0 AS sent_count,
|
||||||
CASE
|
CASE
|
||||||
WHEN received_notes.is_change THEN 1
|
WHEN received_notes.is_change THEN 1
|
||||||
ELSE 0
|
ELSE 0
|
||||||
|
@ -481,7 +481,6 @@ mod tests {
|
||||||
WHEN received_notes.is_change THEN 0
|
WHEN received_notes.is_change THEN 0
|
||||||
ELSE 1
|
ELSE 1
|
||||||
END AS received_count,
|
END AS received_count,
|
||||||
0 AS sent_count,
|
|
||||||
CASE
|
CASE
|
||||||
WHEN received_notes.memo IS NULL THEN 0
|
WHEN received_notes.memo IS NULL THEN 0
|
||||||
ELSE 1
|
ELSE 1
|
||||||
|
@ -498,12 +497,11 @@ mod tests {
|
||||||
transactions.fee AS fee,
|
transactions.fee AS fee,
|
||||||
-sent_notes.value AS value,
|
-sent_notes.value AS value,
|
||||||
CASE
|
CASE
|
||||||
WHEN sent_notes.from_account = sent_notes.to_account THEN 1
|
WHEN sent_notes.from_account = sent_notes.to_account THEN 0
|
||||||
ELSE 0
|
ELSE 1
|
||||||
END AS is_wallet_internal,
|
END AS sent_count,
|
||||||
0 AS is_change,
|
0 AS is_change,
|
||||||
0 AS received_count,
|
0 AS received_count,
|
||||||
1 AS sent_count,
|
|
||||||
CASE
|
CASE
|
||||||
WHEN sent_notes.memo IS NULL THEN 0
|
WHEN sent_notes.memo IS NULL THEN 0
|
||||||
ELSE 1
|
ELSE 1
|
||||||
|
|
|
@ -209,7 +209,7 @@ impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
|
||||||
notes.raw,
|
notes.raw,
|
||||||
SUM(notes.value) + MAX(notes.fee) AS net_value,
|
SUM(notes.value) + MAX(notes.fee) AS net_value,
|
||||||
MAX(notes.fee) AS fee_paid,
|
MAX(notes.fee) AS fee_paid,
|
||||||
SUM(notes.is_wallet_internal) > 0 AS is_wallet_internal,
|
SUM(notes.sent_count) == 0 AS is_wallet_internal,
|
||||||
SUM(notes.is_change) > 0 AS has_change,
|
SUM(notes.is_change) > 0 AS has_change,
|
||||||
SUM(notes.sent_count) AS sent_note_count,
|
SUM(notes.sent_count) AS sent_note_count,
|
||||||
SUM(notes.received_count) AS received_note_count,
|
SUM(notes.received_count) AS received_note_count,
|
||||||
|
@ -227,7 +227,7 @@ impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
|
||||||
WHEN received_notes.is_change THEN 0
|
WHEN received_notes.is_change THEN 0
|
||||||
ELSE value
|
ELSE value
|
||||||
END AS value,
|
END AS value,
|
||||||
0 AS is_wallet_internal,
|
0 AS sent_count,
|
||||||
CASE
|
CASE
|
||||||
WHEN received_notes.is_change THEN 1
|
WHEN received_notes.is_change THEN 1
|
||||||
ELSE 0
|
ELSE 0
|
||||||
|
@ -236,7 +236,6 @@ impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
|
||||||
WHEN received_notes.is_change THEN 0
|
WHEN received_notes.is_change THEN 0
|
||||||
ELSE 1
|
ELSE 1
|
||||||
END AS received_count,
|
END AS received_count,
|
||||||
0 AS sent_count,
|
|
||||||
CASE
|
CASE
|
||||||
WHEN received_notes.memo IS NULL THEN 0
|
WHEN received_notes.memo IS NULL THEN 0
|
||||||
ELSE 1
|
ELSE 1
|
||||||
|
@ -253,12 +252,11 @@ impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
|
||||||
transactions.fee AS fee,
|
transactions.fee AS fee,
|
||||||
-sent_notes.value AS value,
|
-sent_notes.value AS value,
|
||||||
CASE
|
CASE
|
||||||
WHEN sent_notes.from_account = sent_notes.to_account THEN 1
|
WHEN sent_notes.from_account = sent_notes.to_account THEN 0
|
||||||
ELSE 0
|
ELSE 1
|
||||||
END AS is_wallet_internal,
|
END AS sent_count,
|
||||||
0 AS is_change,
|
0 AS is_change,
|
||||||
0 AS received_count,
|
0 AS received_count,
|
||||||
1 AS sent_count,
|
|
||||||
CASE
|
CASE
|
||||||
WHEN sent_notes.memo IS NULL THEN 0
|
WHEN sent_notes.memo IS NULL THEN 0
|
||||||
ELSE 1
|
ELSE 1
|
||||||
|
|
Loading…
Reference in New Issue