From cf6fa6b5539610df21e18700d0c2fa676d21486a Mon Sep 17 00:00:00 2001 From: Vanshdeep Singh Date: Mon, 17 Sep 2018 15:36:38 +0200 Subject: [PATCH] Problem: Election type not casted for runnign command (#2551) Solution: Replace '-' with '_' before running election sub-command --- bigchaindb/commands/bigchaindb.py | 3 ++- tests/commands/test_commands.py | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bigchaindb/commands/bigchaindb.py b/bigchaindb/commands/bigchaindb.py index f9588dcd..58db7ac0 100644 --- a/bigchaindb/commands/bigchaindb.py +++ b/bigchaindb/commands/bigchaindb.py @@ -113,7 +113,8 @@ def run_election(args): def run_election_new(args, bigchain): - globals()[f'run_election_new_{args.election_type}'](args, bigchain) + election_type = args.election_type.replace('-', '_') + globals()[f'run_election_new_{election_type}'](args, bigchain) def create_new_election(sk, bigchain, election_class, data): diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py index bbeea227..f9b14f89 100644 --- a/tests/commands/test_commands.py +++ b/tests/commands/test_commands.py @@ -306,7 +306,7 @@ def test_election_new_upsert_validator_with_tendermint(b, priv_validator_path, u from bigchaindb.commands.bigchaindb import run_election_new_upsert_validator new_args = Namespace(action='new', - election_type='upsert_validator', + election_type='upsert-validator', public_key='HHG0IQRybpT6nJMIWWFWhMczCLHt6xcm7eP52GnGuPY=', power=1, node_id='unique_node_id_for_test_upsert_validator_new_with_tendermint', @@ -330,7 +330,7 @@ def test_election_new_upsert_validator_without_tendermint(caplog, b, priv_valida b.write_transaction = mock_write args = Namespace(action='new', - election_type='upsert_validator', + election_type='upsert-validator', public_key='CJxdItf4lz2PwEf4SmYNAu/c/VpmX39JEgC5YpH7fxg=', power=1, node_id='fb7140f03a4ffad899fabbbf655b97e0321add66', @@ -384,7 +384,7 @@ def test_election_new_upsert_validator_invalid_election(caplog, b, priv_validato from bigchaindb.commands.bigchaindb import run_election_new_upsert_validator args = Namespace(action='new', - election_type='upsert_validator', + election_type='upsert-validator', public_key='CJxdItf4lz2PwEf4SmYNAu/c/VpmX39JEgC5YpH7fxg=', power=10, node_id='fb7140f03a4ffad899fabbbf655b97e0321add66', @@ -408,7 +408,7 @@ def test_election_new_upsert_validator_invalid_power(caplog, b, priv_validator_p b.write_transaction = mock_write b.get_validators = mock_get_validators args = Namespace(action='new', - election_type='upsert_validator', + election_type='upsert-validator', public_key='CJxdItf4lz2PwEf4SmYNAu/c/VpmX39JEgC5YpH7fxg=', power=10, node_id='fb7140f03a4ffad899fabbbf655b97e0321add66', @@ -427,7 +427,7 @@ def test_election_approve_with_tendermint(b, priv_validator_path, user_sk, valid public_key = 'CJxdItf4lz2PwEf4SmYNAu/c/VpmX39JEgC5YpH7fxg=' new_args = Namespace(action='new', - election_type='upsert_validator', + election_type='upsert-validator', public_key=public_key, power=1, node_id='fb7140f03a4ffad899fabbbf655b97e0321add66',