[wallet] Move getBlockHash from Chain::Lock interface to simple Chain
This commit is contained in:
parent
de13363a47
commit
0a76287387
3 changed files with 12 additions and 12 deletions
|
@ -55,13 +55,6 @@ bool FillBlock(const CBlockIndex* index, const FoundBlock& block, UniqueLock<Rec
|
||||||
|
|
||||||
class LockImpl : public Chain::Lock, public UniqueLock<RecursiveMutex>
|
class LockImpl : public Chain::Lock, public UniqueLock<RecursiveMutex>
|
||||||
{
|
{
|
||||||
uint256 getBlockHash(int height) override
|
|
||||||
{
|
|
||||||
LockAssertion lock(::cs_main);
|
|
||||||
CBlockIndex* block = ::ChainActive()[height];
|
|
||||||
assert(block != nullptr);
|
|
||||||
return block->GetBlockHash();
|
|
||||||
}
|
|
||||||
bool haveBlockOnDisk(int height) override
|
bool haveBlockOnDisk(int height) override
|
||||||
{
|
{
|
||||||
LockAssertion lock(::cs_main);
|
LockAssertion lock(::cs_main);
|
||||||
|
@ -234,6 +227,13 @@ public:
|
||||||
}
|
}
|
||||||
return nullopt;
|
return nullopt;
|
||||||
}
|
}
|
||||||
|
uint256 getBlockHash(int height) override
|
||||||
|
{
|
||||||
|
LOCK(::cs_main);
|
||||||
|
CBlockIndex* block = ::ChainActive()[height];
|
||||||
|
assert(block);
|
||||||
|
return block->GetBlockHash();
|
||||||
|
}
|
||||||
bool findBlock(const uint256& hash, const FoundBlock& block) override
|
bool findBlock(const uint256& hash, const FoundBlock& block) override
|
||||||
{
|
{
|
||||||
WAIT_LOCK(cs_main, lock);
|
WAIT_LOCK(cs_main, lock);
|
||||||
|
|
|
@ -87,9 +87,6 @@ public:
|
||||||
public:
|
public:
|
||||||
virtual ~Lock() {}
|
virtual ~Lock() {}
|
||||||
|
|
||||||
//! Get block hash. Height must be valid or this function will abort.
|
|
||||||
virtual uint256 getBlockHash(int height) = 0;
|
|
||||||
|
|
||||||
//! Check that the block is available on disk (i.e. has not been
|
//! Check that the block is available on disk (i.e. has not been
|
||||||
//! pruned), and contains transactions.
|
//! pruned), and contains transactions.
|
||||||
virtual bool haveBlockOnDisk(int height) = 0;
|
virtual bool haveBlockOnDisk(int height) = 0;
|
||||||
|
@ -135,6 +132,9 @@ public:
|
||||||
//! included in the current chain.
|
//! included in the current chain.
|
||||||
virtual Optional<int> getBlockHeight(const uint256& hash) = 0;
|
virtual Optional<int> getBlockHeight(const uint256& hash) = 0;
|
||||||
|
|
||||||
|
//! Get block hash. Height must be valid or this function will abort.
|
||||||
|
virtual uint256 getBlockHash(int height) = 0;
|
||||||
|
|
||||||
//! Return whether node has the block and optionally return block metadata
|
//! Return whether node has the block and optionally return block metadata
|
||||||
//! or contents.
|
//! or contents.
|
||||||
virtual bool findBlock(const uint256& hash, const FoundBlock& block={}) = 0;
|
virtual bool findBlock(const uint256& hash, const FoundBlock& block={}) = 0;
|
||||||
|
|
|
@ -3943,7 +3943,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
|
||||||
|
|
||||||
const Optional<int> tip_height = chain.getHeight();
|
const Optional<int> tip_height = chain.getHeight();
|
||||||
if (tip_height) {
|
if (tip_height) {
|
||||||
walletInstance->m_last_block_processed = locked_chain->getBlockHash(*tip_height);
|
walletInstance->m_last_block_processed = chain.getBlockHash(*tip_height);
|
||||||
walletInstance->m_last_block_processed_height = *tip_height;
|
walletInstance->m_last_block_processed_height = *tip_height;
|
||||||
} else {
|
} else {
|
||||||
walletInstance->m_last_block_processed.SetNull();
|
walletInstance->m_last_block_processed.SetNull();
|
||||||
|
@ -3989,7 +3989,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
|
||||||
|
|
||||||
{
|
{
|
||||||
WalletRescanReserver reserver(*walletInstance);
|
WalletRescanReserver reserver(*walletInstance);
|
||||||
if (!reserver.reserve() || (ScanResult::SUCCESS != walletInstance->ScanForWalletTransactions(locked_chain->getBlockHash(rescan_height), rescan_height, {} /* max height */, reserver, true /* update */).status)) {
|
if (!reserver.reserve() || (ScanResult::SUCCESS != walletInstance->ScanForWalletTransactions(chain.getBlockHash(rescan_height), rescan_height, {} /* max height */, reserver, true /* update */).status)) {
|
||||||
error = _("Failed to rescan the wallet during initialization").translated;
|
error = _("Failed to rescan the wallet during initialization").translated;
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue