GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2wp: -mainchainrpccookiefile defaults to regtest/.cookie for all chains

Browse source
This commit is contained in:
Jorge Timón 2017-11-06 19:38:57 +01:00
parent b979d44271
commit a58d2293c2
No known key found for this signature in database
GPG key ID: 8866C18EA1C944A2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/protocol.cpp
View file

@ -68,6 +68,7 @@ UniValue JSONRPCError(int code, const string& message)
static const std::string COOKIEAUTH_USER = "__cookie__"; static const std::string COOKIEAUTH_USER = "__cookie__";
/** Default name for auth cookie file */ /** Default name for auth cookie file */
static const std::string COOKIEAUTH_FILE = ".cookie"; static const std::string COOKIEAUTH_FILE = ".cookie";
static const std::string MAINCHAIN_COOKIEAUTH_FILE = "regtest/.cookie";
boost::filesystem::path GetAuthCookieFile() boost::filesystem::path GetAuthCookieFile()
{ {
@ -78,8 +79,7 @@ boost::filesystem::path GetAuthCookieFile()
boost::filesystem::path GetMainchainAuthCookieFile() boost::filesystem::path GetMainchainAuthCookieFile()
{ {
boost::filesystem::path path(GetArg("-mainchainrpccookiefile", COOKIEAUTH_FILE)); boost::filesystem::path path(GetArg("-mainchainrpccookiefile", MAINCHAIN_COOKIEAUTH_FILE));
if (!path.is_complete() && BaseParams().DataDir() == CHAINPARAMS_REGTEST) path = "regtest" / path;
if (!path.is_complete()) path = GetDataDir(false) / path; if (!path.is_complete()) path = GetDataDir(false) / path;
return path; return path;
} }