Skip to content

Commit 570e308

Browse files
kwvgkwvg
committed
refactor: s/ipAndPort/coreP2PAddrs/g
1 parent 8196dff commit 570e308

File tree

5 files changed

+40
-40
lines changed

5 files changed

+40
-40
lines changed

‎src/rpc/evo.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ static RPCArg GetRpcArg(const std::string& strParamName)
7474
"If not specified, payoutAddress is the one that is going to be used.\n"
7575
"The private key belonging to this address must be known in your wallet."}
7676
},
77-
{"ipAndPort",
78-
{"ipAndPort", RPCArg::Type::ARR, RPCArg::Optional::NO,
77+
{"coreP2PAddrs",
78+
{"coreP2PAddrs", RPCArg::Type::ARR, RPCArg::Optional::NO,
7979
"Array of addresses in the form \"ADDR:PORT\". Must be unique on the network.\n"
8080
"Can be set to an empty string, which will require a ProUpServTx afterwards.",
8181
{
8282
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, ""},
8383
}}
8484
},
85-
{"ipAndPort_update",
86-
{"ipAndPort", RPCArg::Type::ARR, RPCArg::Optional::NO,
85+
{"coreP2PAddrs_update",
86+
{"coreP2PAddrs", RPCArg::Type::ARR, RPCArg::Optional::NO,
8787
"Array of addresses in the form \"ADDR:PORT\". Must be unique on the network.",
8888
{
8989
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, ""},
@@ -384,7 +384,7 @@ static RPCHelpMan protx_register_fund_wrapper(const bool legacy)
384384
+ HELP_REQUIRING_PASSPHRASE,
385385
{
386386
GetRpcArg("collateralAddress"),
387-
GetRpcArg("ipAndPort"),
387+
GetRpcArg("coreP2PAddrs"),
388388
GetRpcArg("ownerAddress"),
389389
legacy ? GetRpcArg("operatorPubKey_register_legacy") : GetRpcArg("operatorPubKey_register"),
390390
GetRpcArg("votingAddress_register"),
@@ -431,7 +431,7 @@ static RPCHelpMan protx_register_wrapper(bool legacy)
431431
{
432432
GetRpcArg("collateralHash"),
433433
GetRpcArg("collateralIndex"),
434-
GetRpcArg("ipAndPort"),
434+
GetRpcArg("coreP2PAddrs"),
435435
GetRpcArg("ownerAddress"),
436436
legacy ? GetRpcArg("operatorPubKey_register_legacy") : GetRpcArg("operatorPubKey_register"),
437437
GetRpcArg("votingAddress_register"),
@@ -479,7 +479,7 @@ static RPCHelpMan protx_register_prepare_wrapper(const bool legacy)
479479
{
480480
GetRpcArg("collateralHash"),
481481
GetRpcArg("collateralIndex"),
482-
GetRpcArg("ipAndPort"),
482+
GetRpcArg("coreP2PAddrs"),
483483
GetRpcArg("ownerAddress"),
484484
legacy ? GetRpcArg("operatorPubKey_register_legacy") : GetRpcArg("operatorPubKey_register"),
485485
GetRpcArg("votingAddress_register"),
@@ -527,7 +527,7 @@ static RPCHelpMan protx_register_fund_evo()
527527
HELP_REQUIRING_PASSPHRASE,
528528
{
529529
GetRpcArg("collateralAddress"),
530-
GetRpcArg("ipAndPort"),
530+
GetRpcArg("coreP2PAddrs"),
531531
GetRpcArg("ownerAddress"),
532532
GetRpcArg("operatorPubKey_register"),
533533
GetRpcArg("votingAddress_register"),
@@ -566,7 +566,7 @@ static RPCHelpMan protx_register_evo()
566566
{
567567
GetRpcArg("collateralHash"),
568568
GetRpcArg("collateralIndex"),
569-
GetRpcArg("ipAndPort"),
569+
GetRpcArg("coreP2PAddrs"),
570570
GetRpcArg("ownerAddress"),
571571
GetRpcArg("operatorPubKey_register"),
572572
GetRpcArg("votingAddress_register"),
@@ -604,7 +604,7 @@ static RPCHelpMan protx_register_prepare_evo()
604604
{
605605
GetRpcArg("collateralHash"),
606606
GetRpcArg("collateralIndex"),
607-
GetRpcArg("ipAndPort"),
607+
GetRpcArg("coreP2PAddrs"),
608608
GetRpcArg("ownerAddress"),
609609
GetRpcArg("operatorPubKey_register"),
610610
GetRpcArg("votingAddress_register"),
@@ -889,7 +889,7 @@ static RPCHelpMan protx_update_service()
889889
+ HELP_REQUIRING_PASSPHRASE,
890890
{
891891
GetRpcArg("proTxHash"),
892-
GetRpcArg("ipAndPort_update"),
892+
GetRpcArg("coreP2PAddrs_update"),
893893
GetRpcArg("operatorKey"),
894894
GetRpcArg("operatorPayoutAddress"),
895895
GetRpcArg("feeSourceAddress"),
@@ -922,7 +922,7 @@ static RPCHelpMan protx_update_service_evo()
922922
HELP_REQUIRING_PASSPHRASE,
923923
{
924924
GetRpcArg("proTxHash"),
925-
GetRpcArg("ipAndPort_update"),
925+
GetRpcArg("coreP2PAddrs_update"),
926926
GetRpcArg("operatorKey"),
927927
GetRpcArg("platformNodeID"),
928928
GetRpcArg("platformP2PPort"),

‎src/rpc/evo_util.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,32 @@ void ProcessNetInfoCore(T1& ptx, const UniValue& input, const bool optional)
1919
CHECK_NONFATAL(ptx.netInfo);
2020

2121
if (!input.isArray() && !input.isStr()) {
22-
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid param for ipAndPort, must be string or array");
22+
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid param for coreP2PAddrs, must be string or array");
2323
}
2424

2525
if (input.isStr()) {
2626
if (!optional && input.get_str().empty()) {
27-
throw JSONRPCError(RPC_INVALID_PARAMETER, "Empty param for ipAndPort not allowed");
27+
throw JSONRPCError(RPC_INVALID_PARAMETER, "Empty param for coreP2PAddrs not allowed");
2828
} else if (!input.get_str().empty()) {
2929
if (auto entryRet = ptx.netInfo->AddEntry(input.get_str()); entryRet != NetInfoStatus::Success) {
30-
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Error setting ipAndPort[0] to '%s' (%s)",
30+
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Error setting coreP2PAddrs[0] to '%s' (%s)",
3131
input.get_str(), NISToString(entryRet)));
3232
}
3333
}
3434
} else if (input.isArray()) {
3535
if (!optional && input.get_array().empty()) {
36-
throw JSONRPCError(RPC_INVALID_PARAMETER, "Empty params for ipAndPort not allowed");
36+
throw JSONRPCError(RPC_INVALID_PARAMETER, "Empty params for coreP2PAddrs not allowed");
3737
} else if (!input.get_array().empty()) {
3838
const UniValue& entries = input.get_array();
3939
for (size_t idx{0}; idx < entries.size(); idx++) {
4040
const UniValue& entry{entries[idx]};
4141
if (!entry.isStr()) {
4242
throw JSONRPCError(RPC_INVALID_PARAMETER,
43-
strprintf("Invalid param for ipAndPort[%d], must be string", idx));
43+
strprintf("Invalid param for coreP2PAddrs[%d], must be string", idx));
4444
}
4545
if (auto entryRet = ptx.netInfo->AddEntry(entry.get_str()); entryRet != NetInfoStatus::Success) {
46-
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Error setting ipAndPort[%d] to '%s' (%s)", idx,
47-
entry.get_str(), NISToString(entryRet)));
46+
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Error setting coreP2PAddrs[%d] to '%s' (%s)",
47+
idx, entry.get_str(), NISToString(entryRet)));
4848
}
4949
}
5050
}

‎test/functional/feature_dip3_deterministicmns.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,15 +237,15 @@ def create_mn_collateral(self, node, mn: MasternodeInfo):
237237
# register a protx MN and also fund it (using collateral inside ProRegTx)
238238
def register_fund_mn(self, node, mn: MasternodeInfo):
239239
node.sendtoaddress(mn.fundsAddr, mn.get_collateral_value() + 0.001)
240-
txid = mn.register_fund(node, submit=True, ipAndPort=[f'127.0.0.1:{mn.nodePort}'])
240+
txid = mn.register_fund(node, submit=True, coreP2PAddrs=[f'127.0.0.1:{mn.nodePort}'])
241241
assert txid is not None
242242
vout = mn.get_collateral_vout(node, txid)
243243
mn.set_params(proTxHash=txid, collateral_txid=txid, collateral_vout=vout)
244244

245245
# create a protx MN which refers to an existing collateral
246246
def register_mn(self, node, mn: MasternodeInfo):
247247
node.sendtoaddress(mn.fundsAddr, 0.001)
248-
proTxHash = mn.register(node, submit=True, ipAndPort=[f'127.0.0.1:{mn.nodePort}'])
248+
proTxHash = mn.register(node, submit=True, coreP2PAddrs=[f'127.0.0.1:{mn.nodePort}'])
249249
mn.set_params(proTxHash=proTxHash)
250250
self.generate(node, 1, sync_fun=self.no_op)
251251

@@ -271,7 +271,7 @@ def update_mn_payee(self, mn: MasternodeInfo, payee):
271271

272272
def test_protx_update_service(self, mn: MasternodeInfo):
273273
self.nodes[0].sendtoaddress(mn.fundsAddr, 0.001)
274-
mn.update_service(self.nodes[0], submit=True, ipAndPort=[f'127.0.0.2:{mn.nodePort}'])
274+
mn.update_service(self.nodes[0], submit=True, coreP2PAddrs=[f'127.0.0.2:{mn.nodePort}'])
275275
self.generate(self.nodes[0], 1)
276276
for node in self.nodes:
277277
protx_info = node.protx('info', mn.proTxHash)
@@ -280,7 +280,7 @@ def test_protx_update_service(self, mn: MasternodeInfo):
280280
assert_equal(mn_list['%s-%d' % (mn.collateral_txid, mn.collateral_vout)]['address'], '127.0.0.2:%d' % mn.nodePort)
281281

282282
# undo
283-
mn.update_service(self.nodes[0], submit=True, ipAndPort=[f'127.0.0.1:{mn.nodePort}'])
283+
mn.update_service(self.nodes[0], submit=True, coreP2PAddrs=[f'127.0.0.1:{mn.nodePort}'])
284284
self.generate(self.nodes[0], 1, sync_fun=self.no_op)
285285

286286
def assert_mnlists(self, mns):

‎test/functional/feature_llmq_simplepose.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def repair_masternodes(self, restart):
208208
if check_banned(self.nodes[0], mn) or check_punished(self.nodes[0], mn):
209209
addr = self.nodes[0].getnewaddress()
210210
self.nodes[0].sendtoaddress(addr, 0.1)
211-
mn.update_service(self.nodes[0], submit=True, ipAndPort=[f'127.0.0.1:{mn.nodePort}'], fundsAddr=addr)
211+
mn.update_service(self.nodes[0], submit=True, coreP2PAddrs=[f'127.0.0.1:{mn.nodePort}'], fundsAddr=addr)
212212
if restart:
213213
self.stop_node(mn.nodeIdx)
214214
self.start_masternode(mn)

‎test/functional/test_framework/test_framework.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,16 +1215,16 @@ def get_node(self, test: BitcoinTestFramework) -> TestNode:
12151215
return test.nodes[self.nodeIdx]
12161216

12171217
def register(self, node: TestNode, submit: bool, collateral_txid: Optional[str] = None, collateral_vout: Optional[int] = None,
1218-
ipAndPort: Union[str, List[str], None] = None, ownerAddr: Optional[str] = None, pubKeyOperator: Optional[str] = None, votingAddr: Optional[str] = None,
1218+
coreP2PAddrs: Union[str, List[str], None] = None, ownerAddr: Optional[str] = None, pubKeyOperator: Optional[str] = None, votingAddr: Optional[str] = None,
12191219
operator_reward: Optional[int] = None, rewards_address: Optional[str] = None, fundsAddr: Optional[str] = None,
12201220
platform_node_id: Optional[str] = None, platform_p2p_port: Optional[int] = None, platform_http_port: Optional[int] = None,
12211221
expected_assert_code: Optional[int] = None, expected_assert_msg: Optional[str] = None) -> Optional[str]:
12221222
if (expected_assert_code and not expected_assert_msg) or (not expected_assert_code and expected_assert_msg):
12231223
raise AssertionError("Intending to use assert_raises_rpc_error() but didn't specify code and message")
12241224

12251225
# We don't store these values internally so all register() calls must specify them in the argument list
1226-
if ipAndPort is None:
1227-
raise AssertionError("ipAndPort is not an optional parameter, must be specified!")
1226+
if coreP2PAddrs is None:
1227+
raise AssertionError("coreP2PAddrs is not an optional parameter, must be specified!")
12281228

12291229
# EvoNode-specific fields are ignored for regular masternodes
12301230
if self.evo:
@@ -1239,7 +1239,7 @@ def register(self, node: TestNode, submit: bool, collateral_txid: Optional[str]
12391239
args = [
12401240
collateral_txid or self.collateral_txid,
12411241
collateral_vout or self.collateral_vout,
1242-
ipAndPort,
1242+
coreP2PAddrs,
12431243
ownerAddr or self.ownerAddr,
12441244
pubKeyOperator or self.pubKeyOperator,
12451245
votingAddr or self.votingAddr,
@@ -1274,7 +1274,7 @@ def register(self, node: TestNode, submit: bool, collateral_txid: Optional[str]
12741274

12751275
return ret
12761276

1277-
def register_fund(self, node: TestNode, submit: bool, collateral_address: Optional[str] = None, ipAndPort: Union[str, List[str], None] = None,
1277+
def register_fund(self, node: TestNode, submit: bool, collateral_address: Optional[str] = None, coreP2PAddrs: Union[str, List[str], None] = None,
12781278
ownerAddr: Optional[str] = None, pubKeyOperator: Optional[str] = None, votingAddr: Optional[str] = None,
12791279
operator_reward: Optional[int] = None, rewards_address: Optional[str] = None, fundsAddr: Optional[str] = None,
12801280
platform_node_id: Optional[str] = None, platform_p2p_port: Optional[int] = None, platform_http_port: Optional[int] = None,
@@ -1283,8 +1283,8 @@ def register_fund(self, node: TestNode, submit: bool, collateral_address: Option
12831283
raise AssertionError("Intending to use assert_raises_rpc_error() but didn't specify code and message")
12841284

12851285
# We don't store these values internally so all register_fund() calls must specify them in the argument list
1286-
if ipAndPort is None:
1287-
raise AssertionError("ipAndPort is not an optional parameter, must be specified!")
1286+
if coreP2PAddrs is None:
1287+
raise AssertionError("coreP2PAddrs is not an optional parameter, must be specified!")
12881288

12891289
# EvoNode-specific fields are ignored for regular masternodes
12901290
if self.evo:
@@ -1306,7 +1306,7 @@ def register_fund(self, node: TestNode, submit: bool, collateral_address: Option
13061306
# Common arguments shared between regular masternodes and EvoNodes
13071307
args = [
13081308
collateral_address or self.collateral_address,
1309-
ipAndPort,
1309+
coreP2PAddrs,
13101310
ownerAddr or self.ownerAddr,
13111311
pubKeyOperator or self.pubKeyOperator,
13121312
votingAddr or self.votingAddr,
@@ -1417,7 +1417,7 @@ def update_registrar(self, node: TestNode, submit: bool, pubKeyOperator: Optiona
14171417

14181418
return ret
14191419

1420-
def update_service(self, node: TestNode, submit: bool, ipAndPort: Union[str, List[str]], platform_node_id: Optional[str] = None, platform_p2p_port: Optional[int] = None,
1420+
def update_service(self, node: TestNode, submit: bool, coreP2PAddrs: Union[str, List[str]], platform_node_id: Optional[str] = None, platform_p2p_port: Optional[int] = None,
14211421
platform_http_port: Optional[int] = None, address_operator: Optional[str] = None, fundsAddr: Optional[str] = None,
14221422
expected_assert_code: Optional[int] = None, expected_assert_msg: Optional[str] = None) -> Optional[str]:
14231423
if (expected_assert_code and not expected_assert_msg) or (not expected_assert_code and expected_assert_msg):
@@ -1449,7 +1449,7 @@ def update_service(self, node: TestNode, submit: bool, ipAndPort: Union[str, Lis
14491449
# Common arguments shared between regular masternodes and EvoNodes
14501450
args = [
14511451
self.proTxHash,
1452-
ipAndPort,
1452+
coreP2PAddrs,
14531453
self.keyOperator,
14541454
]
14551455
address_funds = fundsAddr or self.fundsAddr
@@ -1650,11 +1650,11 @@ def dynamically_prepare_masternode(self, idx, node_p2p_port, evo=False, rnd=None
16501650
mn.bury_tx(self, genIdx=0, txid=collateral_txid, depth=1)
16511651
collateral_vout = mn.get_collateral_vout(self.nodes[0], collateral_txid)
16521652

1653-
ipAndPort = ['127.0.0.1:%d' % node_p2p_port]
1653+
coreP2PAddrs = ['127.0.0.1:%d' % node_p2p_port]
16541654
operatorReward = idx
16551655

16561656
# platform_node_id, platform_p2p_port and platform_http_port are ignored for regular masternodes
1657-
protx_result = mn.register(self.nodes[0], submit=True, collateral_txid=collateral_txid, collateral_vout=collateral_vout, ipAndPort=ipAndPort, operator_reward=operatorReward,
1657+
protx_result = mn.register(self.nodes[0], submit=True, collateral_txid=collateral_txid, collateral_vout=collateral_vout, coreP2PAddrs=coreP2PAddrs, operator_reward=operatorReward,
16581658
platform_node_id=platform_node_id, platform_p2p_port=platform_p2p_port, platform_http_port=platform_http_port)
16591659
assert protx_result is not None
16601660

@@ -1716,16 +1716,16 @@ def prepare_masternode(self, idx):
17161716
self.nodes[0].sendtoaddress(mn.fundsAddr, 0.001)
17171717

17181718
port = p2p_port(len(self.nodes) + idx)
1719-
ipAndPort = ['127.0.0.1:%d' % port]
1719+
coreP2PAddrs = ['127.0.0.1:%d' % port]
17201720
operatorReward = idx
17211721

17221722
submit = (idx % 4) < 2
17231723

17241724
if register_fund:
1725-
protx_result = mn.register_fund(self.nodes[0], submit=submit, ipAndPort=ipAndPort, operator_reward=operatorReward)
1725+
protx_result = mn.register_fund(self.nodes[0], submit=submit, coreP2PAddrs=coreP2PAddrs, operator_reward=operatorReward)
17261726
else:
17271727
self.generate(self.nodes[0], 1, sync_fun=self.no_op)
1728-
protx_result = mn.register(self.nodes[0], submit=submit, collateral_txid=txid, collateral_vout=collateral_vout, ipAndPort=ipAndPort,
1728+
protx_result = mn.register(self.nodes[0], submit=submit, collateral_txid=txid, collateral_vout=collateral_vout, coreP2PAddrs=coreP2PAddrs,
17291729
operator_reward=operatorReward)
17301730
if submit:
17311731
proTxHash = protx_result
@@ -1737,7 +1737,7 @@ def prepare_masternode(self, idx):
17371737
if operatorReward > 0:
17381738
self.generate(self.nodes[0], 1, sync_fun=self.no_op)
17391739
operatorPayoutAddress = self.nodes[0].getnewaddress()
1740-
mn.update_service(self.nodes[0], submit=True, ipAndPort=ipAndPort, address_operator=operatorPayoutAddress)
1740+
mn.update_service(self.nodes[0], submit=True, coreP2PAddrs=coreP2PAddrs, address_operator=operatorPayoutAddress)
17411741

17421742
self.mninfo.append(mn)
17431743
self.log.info("Prepared MN %d: collateral_txid=%s, collateral_vout=%d, protxHash=%s" % (idx, txid, collateral_vout, proTxHash))

0 commit comments

Comments
 (0)