Merge #520: [0.17] Default to elementsregtest, when syncing liquid, find cookie

5273ed5 Default to mainnet cookie for liquidv1 (Gregory Sanders)
8ea52ee Default to elementsregtest (Gregory Sanders)

Pull request description:

  Cookie defaults looking in `regtest` directory currently.

Tree-SHA512: df8e384f12c84e7adf86edcc2d4a96432187ce58b76f19ea347b911988f55177efebcd8f5a5986acfe19044535b27ad896ec3f75a273bae24826e33ba58f40e0

Author: instagibbs

src/rpc/protocol.cpp

@@ -131,7 +131,12 @@ static const std::string MAINCHAIN_COOKIEAUTH_FILE = "regtest/.cookie";
 /** Get name mainchain RPC authentication cookie file */
 static fs::path GetMainchainAuthCookieFile()
 {
-    boost::filesystem::path path(gArgs.GetArg("-mainchainrpccookiefile", MAINCHAIN_COOKIEAUTH_FILE));
+    std::string cookie_file = MAINCHAIN_COOKIEAUTH_FILE;
+    // Bitcoin mainnet exception
+    if (gArgs.GetChainName() == "liquidv1") {
+        cookie_file = ".cookie";
+    }
+    boost::filesystem::path path(gArgs.GetArg("-mainchainrpccookiefile", cookie_file));
     if (!path.is_complete()) path = GetDataDir(false) / path;
     return path;
 }

src/test/util_tests.cpp

@@ -558,7 +558,7 @@ BOOST_AUTO_TEST_CASE(util_GetChainName)
     std::string error;
 
     test_args.ParseParameters(0, (char**)argv_testnet, error);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), "main");
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "elementsregtest");
 
     test_args.ParseParameters(2, (char**)argv_testnet, error);
     BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");

src/util.cpp

@@ -980,7 +980,7 @@ std::string ArgsManager::GetChainName() const
         return CBaseChainParams::REGTEST;
     if (fTestNet)
         return CBaseChainParams::TESTNET;
-    return GetArg("-chain", CBaseChainParams::MAIN);
+    return GetArg("-chain", "elementsregtest");
 }
 
 #ifndef WIN32