bitcoin: Make wrapper not require -m

Choose the right binary by default if an IPC option is specified

Github-Pull: #33229
Rebased-From: 453b0fa286

test/functional/tool_bitcoin.py

@@ -7,7 +7,10 @@ from test_framework.test_framework import (
     BitcoinTestFramework,
     SkipTest,
 )
-from test_framework.util import assert_equal
+from test_framework.util import (
+    append_config,
+    assert_equal,
+)
 
 import platform
 import re
@@ -55,12 +58,11 @@ class ToolBitcoinTest(BitcoinTestFramework):
                 raise RuntimeError(f"Unexpected output from {node.args + extra_args}: {out=!r} {err=!r} {ret=!r}") from e
 
     def run_test(self):
+        node = self.nodes[0]
+
         self.log.info("Ensure bitcoin node command invokes bitcoind by default")
         self.test_args([], [], expect_exe="bitcoind")
 
-        self.log.info("Ensure bitcoin command does not accept -ipcbind by default")
-        self.test_args(["-M"], ["-ipcbind=unix"], expect_error='Error: Error parsing command line arguments: Invalid parameter -ipcbind=unix')
-
         self.log.info("Ensure bitcoin -M invokes bitcoind")
         self.test_args(["-M"], [], expect_exe="bitcoind")
 
@@ -74,6 +76,13 @@ class ToolBitcoinTest(BitcoinTestFramework):
             self.log.info("Ensure bitcoin -m does accept -ipcbind")
             self.test_args(["-m"], ["-ipcbind=unix"], expect_exe="bitcoin-node")
 
+            self.log.info("Ensure bitcoin accepts -ipcbind by default")
+            self.test_args([], ["-ipcbind=unix"], expect_exe="bitcoin-node")
+
+            self.log.info("Ensure bitcoin recognizes -ipcbind in config file")
+            append_config(node.datadir_path, ["ipcbind=unix"])
+            self.test_args([], [], expect_exe="bitcoin-node")
+
 
 def get_node_output(node):
     ret = node.process.wait(timeout=60)

test/lint/check-doc.py

@@ -23,7 +23,7 @@ CMD_GREP_WALLET_ARGS = r"git grep --function-context 'void WalletInit::AddWallet
 CMD_GREP_WALLET_HIDDEN_ARGS = r"git grep --function-context 'void DummyWalletInit::AddWalletOptions' -- {}".format(CMD_ROOT_DIR)
 CMD_GREP_DOCS = r"git grep --perl-regexp '{}' {}".format(REGEX_DOC, CMD_ROOT_DIR)
 # list unsupported, deprecated and duplicate args as they need no documentation
-SET_DOC_OPTIONAL = set(['-h', '-?', '-dbcrashratio', '-forcecompactdb'])
+SET_DOC_OPTIONAL = set(['-h', '-?', '-dbcrashratio', '-forcecompactdb', '-ipcconnect', '-ipcfd'])
 
 
 def lint_missing_argument_documentation():