mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#33430: rpc: addpeeraddress: throw on invalid IP

Browse Source 
316a0c5132 rpc: addpeeraddress: throw on invalid IP (John Moffett)

Pull request description:

  Right now we return an opaque `{"success" : false}` in `addpeeraddress` for an empty or invalid IP. This changes it to throw `RPC_CLIENT_INVALID_IP_OR_SUBNET` with the error message `Invalid IP address`. Tests updated to match.

ACKs for top commit:
  sipa:
    utACK 316a0c5132
  achow101:
    ACK 316a0c5132
  vasild:
    ACK 316a0c5132
  pablomartin4btc:
    tACK 316a0c5132

Tree-SHA512: 79a8ce127d0a24b2eb1f31bc3294b895d0c6424032a6b49168259e0e94aff69723d067adf1b4dc3c9b79e597531e5b65e4b8fc5a8e21fba0b81f99168de12b96
This commit is contained in:
Ava Chow committed 2025-09-25 15:42:12 -07:00
2 parents 31b29f8eb6 316a0c5132
commit 65e909dfdd
2 files changed
+22 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/functional/rpc_net.py
+4 -1
View File
@@ -346,9 +346,12 @@ class NetTest(BitcoinTestFramework):
assert "unknown command: addpeeraddress" not in node.help("addpeeraddress")
self.log.debug("Test that adding an empty address fails")
assert_equal(node.addpeeraddress(address="", port=8333), {"success": False})
assert_raises_rpc_error(-30, "Invalid IP address", node.addpeeraddress, address="", port=8333)
assert_equal(node.getnodeaddresses(count=0), [])
self.log.debug("Test that adding a non-IP/hostname fails (no DNS lookup allowed)")
assert_raises_rpc_error(-30, "Invalid IP address", node.addpeeraddress, address="not_an_ip", port=8333)
self.log.debug("Test that non-bool tried fails")
assert_raises_rpc_error(-3, "JSON value of type string is not of expected type bool", self.nodes[0].addpeeraddress, address="1.2.3.4", tried="True", port=1234)