Skip to content

Commit 2a5d73b

Browse files
popentapopenta
committed
fix after review
1 parent d58ed56 commit 2a5d73b

9 files changed

Lines changed: 38 additions & 118 deletions

File tree

‎multiversx_sdk_cli/cli.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import multiversx_sdk_cli.cli_wallet
2828
import multiversx_sdk_cli.version
2929
from multiversx_sdk_cli import config, errors, utils, ux
30+
from multiversx_sdk_cli.cli_shared import set_proxy_from_config_if_not_provided
3031
from multiversx_sdk_cli.env import get_address_hrp
3132

3233
logger = logging.getLogger("cli")
@@ -77,6 +78,7 @@ def _do_main(cli_args: list[str]):
7778
if not hasattr(args, "func"):
7879
parser.print_help()
7980
else:
81+
set_proxy_from_config_if_not_provided(args)
8082
args.func(args)
8183

8284

‎multiversx_sdk_cli/cli_contracts.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,6 @@ def build(args: Any):
319319
def deploy(args: Any):
320320
logger.debug("deploy")
321321

322-
cli_shared.set_proxy_from_config_if_not_provided(args)
323-
324322
validate_transaction_args(args)
325323
ensure_wallet_args_are_provided(args)
326324
validate_broadcast_args(args)
@@ -372,8 +370,6 @@ def deploy(args: Any):
372370
def call(args: Any):
373371
logger.debug("call")
374372

375-
cli_shared.set_proxy_from_config_if_not_provided(args)
376-
377373
validate_transaction_args(args)
378374
ensure_wallet_args_are_provided(args)
379375
validate_broadcast_args(args)
@@ -420,8 +416,6 @@ def call(args: Any):
420416
def upgrade(args: Any):
421417
logger.debug("upgrade")
422418

423-
cli_shared.set_proxy_from_config_if_not_provided(args)
424-
425419
validate_transaction_args(args)
426420
ensure_wallet_args_are_provided(args)
427421
validate_broadcast_args(args)
@@ -467,8 +461,6 @@ def upgrade(args: Any):
467461
def query(args: Any):
468462
logger.debug("query")
469463

470-
cli_shared.set_proxy_from_config_if_not_provided(args)
471-
472464
validate_proxy_argument(args)
473465

474466
# we don't need chainID to query a contract; we use the provided proxy

‎multiversx_sdk_cli/cli_delegation.py‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,6 @@ def _get_delegation_controller(args: Any):
402402

403403

404404
def do_create_delegation_contract(args: Any):
405-
cli_shared.set_proxy_from_config_if_not_provided(args)
406-
407405
validate_arguments(args)
408406

409407
sender = cli_shared.prepare_sender(args)
@@ -432,8 +430,6 @@ def do_create_delegation_contract(args: Any):
432430

433431

434432
def get_contract_address_by_deploy_tx_hash(args: Any):
435-
cli_shared.set_proxy_from_config_if_not_provided(args)
436-
437433
validate_proxy_argument(args)
438434

439435
config = get_config_for_network_providers()
@@ -451,8 +447,6 @@ def get_contract_address_by_deploy_tx_hash(args: Any):
451447

452448

453449
def add_new_nodes(args: Any):
454-
cli_shared.set_proxy_from_config_if_not_provided(args)
455-
456450
validate_arguments(args)
457451

458452
sender = cli_shared.prepare_sender(args)
@@ -501,8 +495,6 @@ def _get_public_keys_and_signed_messages(args: Any) -> tuple[list[ValidatorPubli
501495

502496

503497
def remove_nodes(args: Any):
504-
cli_shared.set_proxy_from_config_if_not_provided(args)
505-
506498
validate_arguments(args)
507499
_check_if_either_bls_keys_or_validators_file_are_provided(args)
508500

@@ -552,8 +544,6 @@ def _parse_public_bls_keys(public_bls_keys: str) -> list[ValidatorPublicKey]:
552544

553545

554546
def stake_nodes(args: Any):
555-
cli_shared.set_proxy_from_config_if_not_provided(args)
556-
557547
_check_if_either_bls_keys_or_validators_file_are_provided(args)
558548
validate_arguments(args)
559549

@@ -592,8 +582,6 @@ def _check_if_either_bls_keys_or_validators_file_are_provided(args: Any):
592582

593583

594584
def unbond_nodes(args: Any):
595-
cli_shared.set_proxy_from_config_if_not_provided(args)
596-
597585
_check_if_either_bls_keys_or_validators_file_are_provided(args)
598586
validate_arguments(args)
599587

@@ -624,8 +612,6 @@ def unbond_nodes(args: Any):
624612

625613

626614
def unstake_nodes(args: Any):
627-
cli_shared.set_proxy_from_config_if_not_provided(args)
628-
629615
_check_if_either_bls_keys_or_validators_file_are_provided(args)
630616
validate_arguments(args)
631617

@@ -656,8 +642,6 @@ def unstake_nodes(args: Any):
656642

657643

658644
def unjail_nodes(args: Any):
659-
cli_shared.set_proxy_from_config_if_not_provided(args)
660-
661645
_check_if_either_bls_keys_or_validators_file_are_provided(args)
662646
validate_arguments(args)
663647

@@ -688,8 +672,6 @@ def unjail_nodes(args: Any):
688672

689673

690674
def delegate(args: Any):
691-
cli_shared.set_proxy_from_config_if_not_provided(args)
692-
693675
validate_arguments(args)
694676

695677
sender = cli_shared.prepare_sender(args)
@@ -718,8 +700,6 @@ def delegate(args: Any):
718700

719701

720702
def claim_rewards(args: Any):
721-
cli_shared.set_proxy_from_config_if_not_provided(args)
722-
723703
validate_arguments(args)
724704

725705
sender = cli_shared.prepare_sender(args)
@@ -746,8 +726,6 @@ def claim_rewards(args: Any):
746726

747727

748728
def redelegate_rewards(args: Any):
749-
cli_shared.set_proxy_from_config_if_not_provided(args)
750-
751729
validate_arguments(args)
752730

753731
sender = cli_shared.prepare_sender(args)
@@ -774,8 +752,6 @@ def redelegate_rewards(args: Any):
774752

775753

776754
def undelegate(args: Any):
777-
cli_shared.set_proxy_from_config_if_not_provided(args)
778-
779755
validate_arguments(args)
780756

781757
sender = cli_shared.prepare_sender(args)
@@ -804,8 +780,6 @@ def undelegate(args: Any):
804780

805781

806782
def withdraw(args: Any):
807-
cli_shared.set_proxy_from_config_if_not_provided(args)
808-
809783
validate_arguments(args)
810784

811785
sender = cli_shared.prepare_sender(args)
@@ -833,8 +807,6 @@ def withdraw(args: Any):
833807

834808

835809
def change_service_fee(args: Any):
836-
cli_shared.set_proxy_from_config_if_not_provided(args)
837-
838810
validate_arguments(args)
839811

840812
sender = cli_shared.prepare_sender(args)
@@ -863,8 +835,6 @@ def change_service_fee(args: Any):
863835

864836

865837
def modify_delegation_cap(args: Any):
866-
cli_shared.set_proxy_from_config_if_not_provided(args)
867-
868838
validate_arguments(args)
869839

870840
sender = cli_shared.prepare_sender(args)
@@ -893,8 +863,6 @@ def modify_delegation_cap(args: Any):
893863

894864

895865
def automatic_activation(args: Any):
896-
cli_shared.set_proxy_from_config_if_not_provided(args)
897-
898866
validate_arguments(args)
899867

900868
sender = cli_shared.prepare_sender(args)
@@ -924,8 +892,6 @@ def automatic_activation(args: Any):
924892

925893

926894
def redelegate_cap(args: Any):
927-
cli_shared.set_proxy_from_config_if_not_provided(args)
928-
929895
validate_arguments(args)
930896

931897
sender = cli_shared.prepare_sender(args)
@@ -955,8 +921,6 @@ def redelegate_cap(args: Any):
955921

956922

957923
def set_metadata(args: Any):
958-
cli_shared.set_proxy_from_config_if_not_provided(args)
959-
960924
validate_arguments(args)
961925

962926
sender = cli_shared.prepare_sender(args)
@@ -987,8 +951,6 @@ def set_metadata(args: Any):
987951

988952

989953
def make_new_contract_from_validator_data(args: Any):
990-
cli_shared.set_proxy_from_config_if_not_provided(args)
991-
992954
validate_arguments(args)
993955

994956
sender = cli_shared.prepare_sender(args)

‎multiversx_sdk_cli/cli_dns.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ def _ensure_proxy_is_provided(args: Any):
136136

137137

138138
def dns_resolve(args: Any):
139-
cli_shared.set_proxy_from_config_if_not_provided(args)
140-
141139
_ensure_proxy_is_provided(args)
142140

143141
config = get_config_for_network_providers()
@@ -147,8 +145,6 @@ def dns_resolve(args: Any):
147145

148146

149147
def dns_validate_name(args: Any):
150-
cli_shared.set_proxy_from_config_if_not_provided(args)
151-
152148
_ensure_proxy_is_provided(args)
153149

154150
config = get_config_for_network_providers()
@@ -172,17 +168,13 @@ def get_dns_address_for_name_hex(args: Any):
172168

173169

174170
def get_registration_cost(args: Any):
175-
cli_shared.set_proxy_from_config_if_not_provided(args)
176-
177171
_ensure_proxy_is_provided(args)
178172

179173
config = get_config_for_network_providers()
180174
print(registration_cost(args.shard_id, ProxyNetworkProvider(url=args.proxy, config=config)))
181175

182176

183177
def get_version(args: Any):
184-
cli_shared.set_proxy_from_config_if_not_provided(args)
185-
186178
_ensure_proxy_is_provided(args)
187179

188180
config = get_config_for_network_providers()

‎multiversx_sdk_cli/cli_governance.py‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,6 @@ def _ensure_args(args: Any):
198198
validate_chain_id_args(args)
199199

200200

201-
def _ensure_proxy_arg(args: Any):
202-
cli_shared.set_proxy_from_config_if_not_provided(args)
203-
validate_proxy_argument(args)
204-
205-
206201
def create_proposal(args: Any):
207202
_ensure_args(args)
208203

@@ -368,7 +363,7 @@ def change_config(args: Any):
368363

369364

370365
def get_voting_power(args: Any):
371-
_ensure_proxy_arg(args)
366+
validate_proxy_argument(args)
372367

373368
config = get_config_for_network_providers()
374369
proxy = ProxyNetworkProvider(url=args.proxy, config=config)
@@ -382,7 +377,7 @@ def get_voting_power(args: Any):
382377

383378

384379
def get_config(args: Any):
385-
_ensure_proxy_arg(args)
380+
validate_proxy_argument(args)
386381

387382
config = get_config_for_network_providers()
388383
proxy = ProxyNetworkProvider(url=args.proxy, config=config)
@@ -394,7 +389,7 @@ def get_config(args: Any):
394389

395390

396391
def get_proposal(args: Any):
397-
_ensure_proxy_arg(args)
392+
validate_proxy_argument(args)
398393

399394
config = get_config_for_network_providers()
400395
proxy = ProxyNetworkProvider(url=args.proxy, config=config)
@@ -406,7 +401,7 @@ def get_proposal(args: Any):
406401

407402

408403
def get_delegated_vote_info(args: Any):
409-
_ensure_proxy_arg(args)
404+
validate_proxy_argument(args)
410405

411406
config = get_config_for_network_providers()
412407
proxy = ProxyNetworkProvider(url=args.proxy, config=config)

0 commit comments

Comments
 (0)