walletdb: Combine VerifyDatabaseFile and VerifyEnvironment

Combine these two functions into a single Verify function that is a
member of WalletDatabase. Additionally, these are no longer static.
This commit is contained in:
Andrew Chow
2020-06-15 14:37:29 -04:00
parent dbd7a91fdf
commit 8f1bcf8b7b
7 changed files with 16 additions and 42 deletions

View File

@ -71,8 +71,7 @@ class ToolWalletTest(BitcoinTestFramework):
self.assert_raises_tool_error('Error: two methods provided (info and create). Only one method should be provided.', 'info', 'create')
self.assert_raises_tool_error('Error parsing command line arguments: Invalid parameter -foo', '-foo')
self.assert_raises_tool_error(
'Error initializing wallet database environment "{}"!\nError loading wallet.dat. Is wallet being used by other process?'
.format(os.path.join(self.nodes[0].datadir, self.chain, 'wallets')),
'Error loading wallet.dat. Is wallet being used by another process?',
'-wallet=wallet.dat',
'info',
)