Skip to content

Commit

Permalink
Revert "Skip N/A accounts in ephemeral addresses table migration"
Browse files Browse the repository at this point in the history
This reverts commit 0956b66.
This is because the official fix in zcash#1524 will address the bug another way.
  • Loading branch information
AArnott committed Sep 7, 2024
1 parent 0956b66 commit b9df96e
Showing 1 changed file with 3 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use schemer_rusqlite::RusqliteMigration;
use uuid::Uuid;
use zcash_protocol::consensus;

use crate::{error::SqliteClientError, wallet::init::WalletMigrationError};
use crate::wallet::init::WalletMigrationError;

#[cfg(feature = "transparent-inputs")]
use crate::wallet::{self, init, transparent::ephemeral};
Expand Down Expand Up @@ -68,11 +68,8 @@ impl<P: consensus::Parameters> RusqliteMigration for Migration<P> {
// stored in each account.
#[cfg(feature = "transparent-inputs")]
for account_id in wallet::get_account_ids(transaction)? {
match ephemeral::init_account(transaction, &self.params, account_id) {
Ok(_) => continue,
Err(SqliteClientError::UnknownZip32Derivation) => continue,
Err(err) => return Err(init::sqlite_client_error_to_wallet_migration_error(err)),
}
ephemeral::init_account(transaction, &self.params, account_id)
.map_err(init::sqlite_client_error_to_wallet_migration_error)?;
}
Ok(())
}
Expand Down

0 comments on commit b9df96e

Please sign in to comment.