[wallet] Specify wallet name in wallet loading errors

jnewbery · promag · commit d84e78ec3930 · 2017-07-28T11:25:38.000+01:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -473,21 +473,21 @@ bool CWallet::Verify()
 
     for (const std::string& walletFile : gArgs.GetArgs("-wallet")) {
         if (boost::filesystem::path(walletFile).filename() != walletFile) {
-            return InitError(_("-wallet parameter must only specify a filename (not a path)"));
+            return InitError(strprintf(_("Error loading wallet %s. -wallet parameter must only specify a filename (not a path)."), walletFile));
         }
 
         if (SanitizeString(walletFile, SAFE_CHARS_FILENAME) != walletFile) {
-            return InitError(_("Invalid characters in -wallet filename"));
+            return InitError(strprintf(_("Error loading wallet %s. Invalid characters in -wallet filename."), walletFile));
         }
 
         fs::path wallet_path = fs::absolute(walletFile, GetDataDir());
 
         if (fs::exists(wallet_path) && (!fs::is_regular_file(wallet_path) || fs::is_symlink(wallet_path))) {
-            return InitError(_("Invalid -wallet file"));
+            return InitError(strprintf(_("Error loading wallet %s. -wallet filename must be a regular file."), walletFile));
         }
 
         if (!wallet_paths.insert(wallet_path).second) {
-            return InitError(_("Duplicate -wallet filename"));
+            return InitError(strprintf(_("Error loading wallet %s. Duplicate -wallet filename specified."), walletFile));
         }
 
         std::string strError;
diff --git a/test/functional/multiwallet.py b/test/functional/multiwallet.py
@@ -23,15 +23,15 @@ def run_test(self):
         self.stop_node(0)
 
         # should not initialize if there are duplicate wallets
-        self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w1', '-wallet=w1'], 'Duplicate -wallet filename')
+        self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w1', '-wallet=w1'], 'Error loading wallet w1. Duplicate -wallet filename specified.')
 
         # should not initialize if wallet file is a directory
         os.mkdir(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w11'))
-        self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w11'], 'Invalid -wallet file')
+        self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w11'], 'Error loading wallet w11. -wallet filename must be a regular file.')
 
         # should not initialize if wallet file is a symlink
         os.symlink(os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w1'), os.path.join(self.options.tmpdir, 'node0', 'regtest', 'w12'))
-        self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w12'], 'Invalid -wallet file')
+        self.assert_start_raises_init_error(0, self.options.tmpdir, ['-wallet=w12'], 'Error loading wallet w12. -wallet filename must be a regular file.')
 
         self.nodes[0] = self.start_node(0, self.options.tmpdir, self.extra_args[0])
 

Original file line number	Diff line number	Diff line change
`@@ -473,21 +473,21 @@ bool CWallet::Verify()`
`473`	`473`
`474`	`474`	`for (const std::string& walletFile : gArgs.GetArgs("-wallet")) {`
`475`	`475`	`if (boost::filesystem::path(walletFile).filename() != walletFile) {`
`476`		`- return InitError(_("-wallet parameter must only specify a filename (not a path)"));`
	`476`	`+ return InitError(strprintf(_("Error loading wallet %s. -wallet parameter must only specify a filename (not a path)."), walletFile));`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`if (SanitizeString(walletFile, SAFE_CHARS_FILENAME) != walletFile) {`
`480`		`- return InitError(_("Invalid characters in -wallet filename"));`
	`480`	`+ return InitError(strprintf(_("Error loading wallet %s. Invalid characters in -wallet filename."), walletFile));`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`fs::path wallet_path = fs::absolute(walletFile, GetDataDir());`
`484`	`484`
`485`	`485`	`if (fs::exists(wallet_path) && (!fs::is_regular_file(wallet_path) \|\| fs::is_symlink(wallet_path))) {`
`486`		`- return InitError(_("Invalid -wallet file"));`
	`486`	`+ return InitError(strprintf(_("Error loading wallet %s. -wallet filename must be a regular file."), walletFile));`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`if (!wallet_paths.insert(wallet_path).second) {`
`490`		`- return InitError(_("Duplicate -wallet filename"));`
	`490`	`+ return InitError(strprintf(_("Error loading wallet %s. Duplicate -wallet filename specified."), walletFile));`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`std::string strError;`