Apply suggestions from code review.

Co-Authored-By: str4d <thestr4d@gmail.com>
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Kris Nuttycombe 2023-09-18 14:13:05 -06:00
parent 6ebd66da76
commit 15bfb41773
3 changed files with 10 additions and 13 deletions

View File

@ -42,9 +42,10 @@ and this library adheres to Rust's notion of
- `FsBlockDbError::CacheMiss`
- `zcash_client_sqlite::FsBlockDb::write_block_metadata` now overwrites any
existing metadata entries that have the same height as a new entry.
- The `v_transactions` and `v_tx_outputs` views now return the 32-byte
transaction identifier for transactions instead of the internal database
id.
- The `v_transactions` and `v_tx_outputs` views no longer return the
internal database identifier for the transaction. The `txid` column
should be used instead. The `tx_index`, `expiry_height`, `raw` and
`fee_paid` columns may now be null for received transparent transactions.
### Removed
- The empty `wallet::transact` module has been removed.
@ -70,6 +71,8 @@ and this library adheres to Rust's notion of
- `WalletDb::get_transaction` no longer returns an error when called on a transaction
that has not yet been mined, unless the transaction's consensus branch ID cannot be
determined by other means.
- Fixed an error in `v_transactions` wherein received transparent outputs did not
result in a transaction entry appearing in the transaction history.
## [0.7.1] - 2023-05-17

View File

@ -478,7 +478,6 @@ mod tests {
FROM sapling_received_notes
JOIN transactions
ON transactions.id_tx = sapling_received_notes.spent
WHERE sapling_received_notes.spent IS NOT NULL
),
sent_note_counts AS (
SELECT sent_notes.from_account AS account_id,
@ -497,8 +496,7 @@ mod tests {
LEFT JOIN sapling_received_notes
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
(sapling_received_notes.tx, 2, sapling_received_notes.output_index)
WHERE sapling_received_notes.is_change IS NULL
OR sapling_received_notes.is_change = 0
WHERE COALESCE(sapling_received_notes.is_change, 0) = 0
GROUP BY account_id, txid
),
blocks_max_height AS (
@ -574,8 +572,7 @@ mod tests {
LEFT JOIN sapling_received_notes
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
(sapling_received_notes.tx, 2, sapling_received_notes.output_index)
WHERE sapling_received_notes.is_change IS NULL
OR sapling_received_notes.is_change = 0".to_owned(),
WHERE COALESCE(sapling_received_notes.is_change, 0) = 0".to_owned(),
];
let mut views_query = st

View File

@ -82,7 +82,6 @@ impl RusqliteMigration for Migration {
FROM sapling_received_notes
JOIN transactions
ON transactions.id_tx = sapling_received_notes.spent
WHERE sapling_received_notes.spent IS NOT NULL
),
sent_note_counts AS (
SELECT sent_notes.from_account AS account_id,
@ -101,8 +100,7 @@ impl RusqliteMigration for Migration {
LEFT JOIN sapling_received_notes
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
(sapling_received_notes.tx, 2, sapling_received_notes.output_index)
WHERE sapling_received_notes.is_change IS NULL
OR sapling_received_notes.is_change = 0
WHERE COALESCE(sapling_received_notes.is_change, 0) = 0
GROUP BY account_id, txid
),
blocks_max_height AS (
@ -179,8 +177,7 @@ impl RusqliteMigration for Migration {
LEFT JOIN sapling_received_notes
ON (sent_notes.tx, sent_notes.output_pool, sent_notes.output_index) =
(sapling_received_notes.tx, 2, sapling_received_notes.output_index)
WHERE sapling_received_notes.is_change IS NULL
OR sapling_received_notes.is_change = 0;"
WHERE COALESCE(sapling_received_notes.is_change, 0) = 0;"
).map_err(WalletMigrationError::from)
}