Cleanups for walletdir PR

meshcollider · meshcollider · commit b67342906ced · 2017-12-13T23:36:43.000+13:00
diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -67,7 +67,7 @@ Custom wallet directories
 The ability to specify a directory other than the default data directory in which to store
 wallets has been added. An existing directory can be specified using the `-walletdir=<dir>`
 argument. Wallets loaded via `-wallet` arguments must be in this wallet directory. Care should be taken
-when choosing a wallet directory location, as if  it becomes unavailable during operation,
+when choosing a wallet directory location, as if it becomes unavailable during operation,
 funds may be lost.
 
 Default wallet directory change
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
@@ -194,7 +194,10 @@ bool VerifyWallets()
     }
 
     if (gArgs.IsArgSet("-walletdir") && !fs::is_directory(GetWalletDir())) {
-        return InitError(strprintf(_("Error: Specified wallet directory \"%s\" does not exist."), gArgs.GetArg("-walletdir", "").c_str()));
+        if (fs::exists(fs::system_complete(gArgs.GetArg("-walletdir", "")))) {
+            return InitError(strprintf(_("Specified -walletdir \"%s\" is not a directory"), gArgs.GetArg("-walletdir", "").c_str()));
+        }
+        return InitError(strprintf(_("Specified -walletdir \"%s\" does not exist"), gArgs.GetArg("-walletdir", "").c_str()));
     }
 
     LogPrintf("Using wallet directory %s\n", GetWalletDir().string());
diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "wallet/walletutil.h"
+#include <wallet/walletutil.h>
 
 fs::path GetWalletDir()
 {
diff --git a/src/wallet/walletutil.h b/src/wallet/walletutil.h
@@ -5,7 +5,8 @@
 #ifndef BITCOIN_WALLET_UTIL_H
 #define BITCOIN_WALLET_UTIL_H
 
-#include "util.h"
+#include <chainparamsbase.h>
+#include <util.h>
 
 //! Get the path of the wallet directory.
 fs::path GetWalletDir();
diff --git a/test/functional/multiwallet.py b/test/functional/multiwallet.py
@@ -40,7 +40,11 @@ def run_test(self):
         self.assert_start_raises_init_error(0, ['-wallet=w12'], 'Error loading wallet w12. -wallet filename must be a regular file.')
 
         # should not initialize if the specified walletdir does not exist
-        self.assert_start_raises_init_error(0, ['-walletdir=bad'], 'Error: Specified wallet directory "bad" does not exist.')
+        self.assert_start_raises_init_error(0, ['-walletdir=bad'], 'Error: Specified -walletdir "bad" does not exist')
+        # should not initialize if the specified walletdir is not a directory
+        not_a_dir = os.path.join(wallet_dir, 'notadir')
+        open(not_a_dir, 'a').close()
+        self.assert_start_raises_init_error(0, ['-walletdir='+not_a_dir], 'Error: Specified -walletdir "' + not_a_dir + '" is not a directory')
 
         # if wallets/ doesn't exist, datadir should be the default wallet dir
         wallet_dir2 = os.path.join(self.options.tmpdir, 'node0', 'regtest', 'walletdir')

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,10 @@ bool VerifyWallets()`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`if (gArgs.IsArgSet("-walletdir") && !fs::is_directory(GetWalletDir())) {`
`197`		`- return InitError(strprintf(_("Error: Specified wallet directory \"%s\" does not exist."), gArgs.GetArg("-walletdir", "").c_str()));`
	`197`	`+ if (fs::exists(fs::system_complete(gArgs.GetArg("-walletdir", "")))) {`
	`198`	`+ return InitError(strprintf(_("Specified -walletdir \"%s\" is not a directory"), gArgs.GetArg("-walletdir", "").c_str()));`
	`199`	`+ }`
	`200`	`+ return InitError(strprintf(_("Specified -walletdir \"%s\" does not exist"), gArgs.GetArg("-walletdir", "").c_str()));`
`198`	`201`	`}`
`199`	`202`
`200`	`203`	`LogPrintf("Using wallet directory %s\n", GetWalletDir().string());`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// Distributed under the MIT software license, see the accompanying`
`3`	`3`	`// file COPYING or http://www.opensource.org/licenses/mit-license.php.`
`4`	`4`
`5`		`-#include "wallet/walletutil.h"`
	`5`	`+#include <wallet/walletutil.h>`
`6`	`6`
`7`	`7`	`fs::path GetWalletDir()`
`8`	`8`	`{`