Skip to content

Commit f59f9f5

Browse files
kwvgkwvg
committed
refactor(rpc): platform{HTTP,P2P}Port > platform{HTTPS,P2P}Addrs
The current name is now a misnomer as we accept (multiple) addr:port pairs, the name has been updated to reflect that. We still support submitting only ports but that is transitional support that may be removed in a future release.
1 parent d519eea commit f59f9f5

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

‎src/rpc/evo.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,32 +183,32 @@ static RPCArg GetRpcArg(const std::string& strParamName)
183183
{"platformNodeID", RPCArg::Type::STR, RPCArg::Optional::NO,
184184
"Platform P2P node ID, derived from P2P public key."}
185185
},
186-
{"platformP2PPort",
187-
{"platformP2PPort", RPCArg::Type::ARR, RPCArg::Optional::NO,
186+
{"platformP2PAddrs",
187+
{"platformP2PAddrs", RPCArg::Type::ARR, RPCArg::Optional::NO,
188188
"Array of addresses in the form \"ADDR:PORT\" used by Platform for peer-to-peer connection.\n"
189189
"Must be unique on the network. Can be set to an empty string, which will require a ProUpServTx afterwards.",
190190
{
191191
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, ""},
192192
}}
193193
},
194-
{"platformP2PPort_update",
195-
{"platformP2PPort", RPCArg::Type::ARR, RPCArg::Optional::NO,
194+
{"platformP2PAddrs_update",
195+
{"platformP2PAddrs", RPCArg::Type::ARR, RPCArg::Optional::NO,
196196
"Array of addresses in the form \"ADDR:PORT\" used by Platform for peer-to-peer connection.\n"
197197
"Must be unique on the network.",
198198
{
199199
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, ""},
200200
}}
201201
},
202-
{"platformHTTPPort",
203-
{"platformHTTPPort", RPCArg::Type::ARR, RPCArg::Optional::NO,
202+
{"platformHTTPSAddrs",
203+
{"platformHTTPSAddrs", RPCArg::Type::ARR, RPCArg::Optional::NO,
204204
"Array of addresses in the form \"ADDR:PORT\" used by Platform for their HTTPS API.\n"
205205
"Must be unique on the network. Can be set to an empty string, which will require a ProUpServTx afterwards.",
206206
{
207207
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, ""},
208208
}}
209209
},
210-
{"platformHTTPPort_update",
211-
{"platformHTTPPort", RPCArg::Type::ARR, RPCArg::Optional::NO,
210+
{"platformHTTPSAddrs_update",
211+
{"platformHTTPSAddrs", RPCArg::Type::ARR, RPCArg::Optional::NO,
212212
"Array of addresses in the form \"ADDR:PORT\" used by Platform for their HTTPS API.\n"
213213
"Must be unique on the network.",
214214
{
@@ -575,8 +575,8 @@ static RPCHelpMan protx_register_fund_evo()
575575
GetRpcArg("operatorReward"),
576576
GetRpcArg("payoutAddress_register"),
577577
GetRpcArg("platformNodeID"),
578-
GetRpcArg("platformP2PPort"),
579-
GetRpcArg("platformHTTPPort"),
578+
GetRpcArg("platformP2PAddrs"),
579+
GetRpcArg("platformHTTPSAddrs"),
580580
GetRpcArg("fundAddress"),
581581
GetRpcArg("submit"),
582582
},
@@ -614,8 +614,8 @@ static RPCHelpMan protx_register_evo()
614614
GetRpcArg("operatorReward"),
615615
GetRpcArg("payoutAddress_register"),
616616
GetRpcArg("platformNodeID"),
617-
GetRpcArg("platformP2PPort"),
618-
GetRpcArg("platformHTTPPort"),
617+
GetRpcArg("platformP2PAddrs"),
618+
GetRpcArg("platformHTTPSAddrs"),
619619
GetRpcArg("feeSourceAddress"),
620620
GetRpcArg("submit"),
621621
},
@@ -652,8 +652,8 @@ static RPCHelpMan protx_register_prepare_evo()
652652
GetRpcArg("operatorReward"),
653653
GetRpcArg("payoutAddress_register"),
654654
GetRpcArg("platformNodeID"),
655-
GetRpcArg("platformP2PPort"),
656-
GetRpcArg("platformHTTPPort"),
655+
GetRpcArg("platformP2PAddrs"),
656+
GetRpcArg("platformHTTPSAddrs"),
657657
GetRpcArg("feeSourceAddress"),
658658
},
659659
RPCResult{
@@ -966,8 +966,8 @@ static RPCHelpMan protx_update_service_evo()
966966
GetRpcArg("coreP2PAddrs_update"),
967967
GetRpcArg("operatorKey"),
968968
GetRpcArg("platformNodeID"),
969-
GetRpcArg("platformP2PPort_update"),
970-
GetRpcArg("platformHTTPPort_update"),
969+
GetRpcArg("platformP2PAddrs_update"),
970+
GetRpcArg("platformHTTPSAddrs_update"),
971971
GetRpcArg("operatorPayoutAddress"),
972972
GetRpcArg("feeSourceAddress"),
973973
GetRpcArg("submit"),

‎src/rpc/evo_util.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ void ProcessNetInfoPlatform(ProTx& ptx, const UniValue& input_p2p, const UniValu
134134
}
135135
}
136136
};
137-
process_field(ptx.platformP2PPort, input_p2p, NetInfoPurpose::PLATFORM_P2P, "platformP2PPort");
138-
process_field(ptx.platformHTTPPort, input_http, NetInfoPurpose::PLATFORM_HTTPS, "platformHTTPPort");
137+
process_field(ptx.platformP2PPort, input_p2p, NetInfoPurpose::PLATFORM_P2P, "platformP2PAddrs");
138+
process_field(ptx.platformHTTPPort, input_http, NetInfoPurpose::PLATFORM_HTTPS, "platformHTTPSAddrs");
139139
}
140140
template void ProcessNetInfoPlatform(CProRegTx& ptx, const UniValue& input_p2p, const UniValue& input_http, const bool optional);
141141
template void ProcessNetInfoPlatform(CProUpServTx& ptx, const UniValue& input_p2p, const UniValue& input_http, const bool optional);

‎test/functional/rpc_netinfo.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def register_mn(self, test: BitcoinTestFramework, submit: bool, addrs_core_p2p,
6565
assert self.mn.nodeIdx is not None
6666

6767
if self.mn.evo and (not addrs_platform_http or not addrs_platform_p2p):
68-
raise AssertionError("EvoNode but platformP2PPort and platformHTTPPort not specified")
68+
raise AssertionError("EvoNode but platformP2PAddrs and platformHTTPSAddrs not specified")
6969

7070
# Evonode-specific fields are ignored if regular masternode
7171
self.platform_nodeid = hash160(b'%d' % randint(1, 65535)).hex()
@@ -97,7 +97,7 @@ def update_mn(self, test: BitcoinTestFramework, addrs_core_p2p, addrs_platform_p
9797
assert self.mn.nodeIdx is not None
9898

9999
if self.mn.evo and (not addrs_platform_http or not addrs_platform_p2p):
100-
raise AssertionError("EvoNode but platformP2PPort and platformHTTPPort not specified")
100+
raise AssertionError("EvoNode but platformP2PAddrs and platformHTTPSAddrs not specified")
101101

102102
# Evonode-specific fields are ignored if regular masternode
103103
protx_output = self.mn.update_service(self.node, submit=True, coreP2PAddrs=addrs_core_p2p, platform_node_id=self.platform_nodeid,
@@ -181,15 +181,15 @@ def test_validation_common(self):
181181
DEFAULT_PORT_PLATFORM_P2P, DEFAULT_PORT_PLATFORM_HTTP,
182182
-8, "Invalid param for coreP2PAddrs[1], must be string")
183183

184-
# platformP2PPort and platformHTTPPort must be within acceptable range (i.e. a valid port number)
184+
# platformP2PAddrs and platformHTTPSAddrs must be within acceptable range (i.e. a valid port number)
185185
self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", "0", DEFAULT_PORT_PLATFORM_HTTP,
186-
-8, "Invalid param for platformP2PPort, must be a valid port [1-65535]")
186+
-8, "Invalid param for platformP2PAddrs, must be a valid port [1-65535]")
187187
self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", "65536", DEFAULT_PORT_PLATFORM_HTTP,
188-
-8, "Invalid param for platformP2PPort, must be a valid port [1-65535]")
188+
-8, "Invalid param for platformP2PAddrs, must be a valid port [1-65535]")
189189
self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", DEFAULT_PORT_PLATFORM_P2P, "0",
190-
-8, "Invalid param for platformHTTPPort, must be a valid port [1-65535]")
190+
-8, "Invalid param for platformHTTPSAddrs, must be a valid port [1-65535]")
191191
self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", DEFAULT_PORT_PLATFORM_P2P, "65536",
192-
-8, "Invalid param for platformHTTPPort, must be a valid port [1-65535]")
192+
-8, "Invalid param for platformHTTPSAddrs, must be a valid port [1-65535]")
193193

194194
def test_validation_legacy(self):
195195
# Using mainnet P2P port gets refused
@@ -202,15 +202,15 @@ def test_validation_legacy(self):
202202
DEFAULT_PORT_PLATFORM_P2P, DEFAULT_PORT_PLATFORM_HTTP,
203203
-8, f"Error setting coreP2PAddrs[1] to '127.0.0.2:{self.node_evo.mn.nodePort}' (too many entries)")
204204

205-
# platformP2PPort and platformHTTPPort doesn't accept non-numeric inputs
205+
# platformP2PAddrs and platformHTTPSAddrs don't accept non-numeric inputs
206206
self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", f"127.0.0.1:{DEFAULT_PORT_PLATFORM_P2P}", DEFAULT_PORT_PLATFORM_HTTP,
207-
-8, "Invalid param for platformP2PPort, ProTx version only supports ports")
207+
-8, "Invalid param for platformP2PAddrs, ProTx version only supports ports")
208208
self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", [f"127.0.0.1:{DEFAULT_PORT_PLATFORM_P2P}"], DEFAULT_PORT_PLATFORM_HTTP,
209-
-8, "Invalid param for platformP2PPort, ProTx version only supports ports")
209+
-8, "Invalid param for platformP2PAddrs, ProTx version only supports ports")
210210
self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", DEFAULT_PORT_PLATFORM_P2P, f"127.0.0.1:{DEFAULT_PORT_PLATFORM_HTTP}",
211-
-8, "Invalid param for platformHTTPPort, ProTx version only supports ports")
211+
-8, "Invalid param for platformHTTPSAddrs, ProTx version only supports ports")
212212
self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", DEFAULT_PORT_PLATFORM_P2P, [f"127.0.0.1:{DEFAULT_PORT_PLATFORM_HTTP}"],
213-
-8, "Invalid param for platformHTTPPort, ProTx version only supports ports")
213+
-8, "Invalid param for platformHTTPSAddrs, ProTx version only supports ports")
214214

215215
def test_deprecation(self):
216216
# netInfo is represented with JSON in CProRegTx, CProUpServTx, CDeterministicMNState and CSimplifiedMNListEntry,

0 commit comments

Comments
 (0)