Skip to content

Commit 5b08d0f

Browse files
coolaj86coolaj86
committed
fix: rename ipAndPort to generic hostnameAndPort
1 parent 3b7deea commit 5b08d0f

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

‎src/rpc/evo.cpp‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,15 @@ static RPCArg GetRpcArg(const std::string& strParamName)
6767
"If not specified, payoutAddress is the one that is going to be used.\n"
6868
"The private key belonging to this address must be known in your wallet."}
6969
},
70-
{"ipAndPort",
71-
{"ipAndPort", RPCArg::Type::STR, RPCArg::Optional::NO,
72-
"IP and port in the form \"IP:PORT\". Must be unique on the network.\n"
70+
// ip or hostname, and port
71+
{"hostnameAndPort",
72+
{"hostnameAndPort", RPCArg::Type::STR, RPCArg::Optional::NO,
73+
"Host in the form \"HOSTNAME:PORT\". Must be unique on the network.\n"
7374
"Can be set to an empty string, which will require a ProUpServTx afterwards."}
7475
},
75-
{"ipAndPort_update",
76-
{"ipAndPort", RPCArg::Type::STR, RPCArg::Optional::NO,
77-
"IP and port in the form \"IP:PORT\". Must be unique on the network."}
76+
{"hostnameAndPort_update",
77+
{"hostnameAndPort", RPCArg::Type::STR, RPCArg::Optional::NO,
78+
"Host in the form \"HOSTNAME:PORT\". Must be unique on the network."}
7879
},
7980
{"operatorKey",
8081
{"operatorKey", RPCArg::Type::STR, RPCArg::Optional::NO,
@@ -367,7 +368,7 @@ static void protx_register_fund_help(const JSONRPCRequest& request, bool legacy)
367368
+ HELP_REQUIRING_PASSPHRASE,
368369
{
369370
GetRpcArg("collateralAddress"),
370-
GetRpcArg("ipAndPort"),
371+
GetRpcArg("hostnameAndPort"),
371372
GetRpcArg("ownerAddress"),
372373
legacy ? GetRpcArg("operatorPubKey_register_legacy") : GetRpcArg("operatorPubKey_register"),
373374
GetRpcArg("votingAddress_register"),
@@ -402,7 +403,7 @@ static void protx_register_help(const JSONRPCRequest& request, bool legacy)
402403
{
403404
GetRpcArg("collateralHash"),
404405
GetRpcArg("collateralIndex"),
405-
GetRpcArg("ipAndPort"),
406+
GetRpcArg("hostnameAndPort"),
406407
GetRpcArg("ownerAddress"),
407408
legacy ? GetRpcArg("operatorPubKey_register_legacy") : GetRpcArg("operatorPubKey_register"),
408409
GetRpcArg("votingAddress_register"),
@@ -436,7 +437,7 @@ static void protx_register_prepare_help(const JSONRPCRequest& request, bool lega
436437
{
437438
GetRpcArg("collateralHash"),
438439
GetRpcArg("collateralIndex"),
439-
GetRpcArg("ipAndPort"),
440+
GetRpcArg("hostnameAndPort"),
440441
GetRpcArg("ownerAddress"),
441442
legacy ? GetRpcArg("operatorPubKey_register_legacy") : GetRpcArg("operatorPubKey_register"),
442443
GetRpcArg("votingAddress_register"),
@@ -489,7 +490,7 @@ static void protx_register_fund_evo_help(const JSONRPCRequest& request)
489490
HELP_REQUIRING_PASSPHRASE,
490491
{
491492
GetRpcArg("collateralAddress"),
492-
GetRpcArg("ipAndPort"),
493+
GetRpcArg("hostnameAndPort"),
493494
GetRpcArg("ownerAddress"),
494495
GetRpcArg("operatorPubKey_register"),
495496
GetRpcArg("votingAddress_register"),
@@ -523,7 +524,7 @@ static void protx_register_evo_help(const JSONRPCRequest& request)
523524
{
524525
GetRpcArg("collateralHash"),
525526
GetRpcArg("collateralIndex"),
526-
GetRpcArg("ipAndPort"),
527+
GetRpcArg("hostnameAndPort"),
527528
GetRpcArg("ownerAddress"),
528529
GetRpcArg("operatorPubKey_register"),
529530
GetRpcArg("votingAddress_register"),
@@ -556,7 +557,7 @@ static void protx_register_prepare_evo_help(const JSONRPCRequest& request)
556557
{
557558
GetRpcArg("collateralHash"),
558559
GetRpcArg("collateralIndex"),
559-
GetRpcArg("ipAndPort"),
560+
GetRpcArg("hostnameAndPort"),
560561
GetRpcArg("ownerAddress"),
561562
GetRpcArg("operatorPubKey_register"),
562563
GetRpcArg("votingAddress_register"),
@@ -856,7 +857,7 @@ static void protx_update_service_help(const JSONRPCRequest& request)
856857
+ HELP_REQUIRING_PASSPHRASE,
857858
{
858859
GetRpcArg("proTxHash"),
859-
GetRpcArg("ipAndPort_update"),
860+
GetRpcArg("hostnameAndPort_update"),
860861
GetRpcArg("operatorKey"),
861862
GetRpcArg("operatorPayoutAddress"),
862863
GetRpcArg("feeSourceAddress"),
@@ -880,7 +881,7 @@ static void protx_update_service_evo_help(const JSONRPCRequest& request)
880881
HELP_REQUIRING_PASSPHRASE,
881882
{
882883
GetRpcArg("proTxHash"),
883-
GetRpcArg("ipAndPort_update"),
884+
GetRpcArg("hostnameAndPort_update"),
884885
GetRpcArg("operatorKey"),
885886
GetRpcArg("platformNodeID"),
886887
GetRpcArg("platformP2PPort"),

‎test/functional/feature_llmq_evo.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,11 @@ def test_evo_is_rejected_before_v19(self):
231231
break
232232
assert collateral_vout is not None
233233

234-
ipAndPort = '127.0.0.1:%d' % p2p_port(len(self.nodes))
234+
hostnameAndPort = 'localhost:%d' % p2p_port(len(self.nodes))
235235
operatorReward = len(self.nodes)
236236

237237
try:
238-
self.nodes[0].protx('register_evo', collateral_txid, collateral_vout, ipAndPort, owner_address, bls['public'], voting_address, operatorReward, reward_address, funds_address, True)
238+
self.nodes[0].protx('register_evo', collateral_txid, collateral_vout, hostnameAndPort, owner_address, bls['public'], voting_address, operatorReward, reward_address, funds_address, True)
239239
# this should never succeed
240240
assert False
241241
except:

‎test/functional/test_framework/test_framework.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,21 +1223,21 @@ def dynamically_prepare_masternode(self, idx, node_p2p_port, evo=False, rnd=None
12231223
break
12241224
assert collateral_vout is not None
12251225

1226-
ipAndPort = '127.0.0.1:%d' % node_p2p_port
1226+
hostnameAndPort = 'localhost:%d' % node_p2p_port
12271227
operatorReward = idx
12281228

12291229
protx_result = None
12301230
if evo:
1231-
protx_result = self.nodes[0].protx("register_evo", collateral_txid, collateral_vout, ipAndPort, owner_address, bls['public'], voting_address, operatorReward, reward_address, platform_node_id, platform_p2p_port, platform_http_port, funds_address, True)
1231+
protx_result = self.nodes[0].protx("register_evo", collateral_txid, collateral_vout, hostnameAndPort, owner_address, bls['public'], voting_address, operatorReward, reward_address, platform_node_id, platform_p2p_port, platform_http_port, funds_address, True)
12321232
else:
1233-
protx_result = self.nodes[0].protx("register", collateral_txid, collateral_vout, ipAndPort, owner_address, bls['public'], voting_address, operatorReward, reward_address, funds_address, True)
1233+
protx_result = self.nodes[0].protx("register", collateral_txid, collateral_vout, hostnameAndPort, owner_address, bls['public'], voting_address, operatorReward, reward_address, funds_address, True)
12341234

12351235
self.wait_for_instantlock(protx_result, self.nodes[0])
12361236
tip = self.nodes[0].generate(1)[0]
12371237
self.sync_all(self.nodes)
12381238

12391239
assert_equal(self.nodes[0].getrawtransaction(protx_result, 1, tip)['confirmations'], 1)
1240-
mn_info = MasternodeInfo(protx_result, owner_address, voting_address, reward_address, operatorReward, bls['public'], bls['secret'], collateral_address, collateral_txid, collateral_vout, ipAndPort, evo)
1240+
mn_info = MasternodeInfo(protx_result, owner_address, voting_address, reward_address, operatorReward, bls['public'], bls['secret'], collateral_address, collateral_txid, collateral_vout, hostnameAndPort, evo)
12411241
self.mninfo.append(mn_info)
12421242

12431243
mn_type_str = "EvoNode" if evo else "MN"
@@ -1307,16 +1307,16 @@ def prepare_masternode(self, idx):
13071307
votingAddr = ownerAddr
13081308

13091309
port = p2p_port(len(self.nodes) + idx)
1310-
ipAndPort = '127.0.0.1:%d' % port
1310+
hostnameAndPort = 'localhost:%d' % port
13111311
operatorReward = idx
13121312

13131313
submit = (idx % 4) < 2
13141314

13151315
if register_fund:
1316-
protx_result = self.nodes[0].protx('register_fund', address, ipAndPort, ownerAddr, bls['public'], votingAddr, operatorReward, rewardsAddr, address, submit)
1316+
protx_result = self.nodes[0].protx('register_fund', address, hostnameAndPort, ownerAddr, bls['public'], votingAddr, operatorReward, rewardsAddr, address, submit)
13171317
else:
13181318
self.nodes[0].generate(1)
1319-
protx_result = self.nodes[0].protx('register', txid, collateral_vout, ipAndPort, ownerAddr, bls['public'], votingAddr, operatorReward, rewardsAddr, address, submit)
1319+
protx_result = self.nodes[0].protx('register', txid, collateral_vout, hostnameAndPort, ownerAddr, bls['public'], votingAddr, operatorReward, rewardsAddr, address, submit)
13201320

13211321
if submit:
13221322
proTxHash = protx_result
@@ -1326,9 +1326,9 @@ def prepare_masternode(self, idx):
13261326
if operatorReward > 0:
13271327
self.nodes[0].generate(1)
13281328
operatorPayoutAddress = self.nodes[0].getnewaddress()
1329-
self.nodes[0].protx('update_service', proTxHash, ipAndPort, bls['secret'], operatorPayoutAddress, address)
1329+
self.nodes[0].protx('update_service', proTxHash, hostnameAndPort, bls['secret'], operatorPayoutAddress, address)
13301330

1331-
self.mninfo.append(MasternodeInfo(proTxHash, ownerAddr, votingAddr, rewardsAddr, operatorReward, bls['public'], bls['secret'], address, txid, collateral_vout, ipAndPort, False))
1331+
self.mninfo.append(MasternodeInfo(proTxHash, ownerAddr, votingAddr, rewardsAddr, operatorReward, bls['public'], bls['secret'], address, txid, collateral_vout, hostnameAndPort, False))
13321332

13331333
self.log.info("Prepared MN %d: collateral_txid=%s, collateral_vout=%d, protxHash=%s" % (idx, txid, collateral_vout, proTxHash))
13341334

0 commit comments

Comments
 (0)