Skip to content

Commit

Permalink
[FIX_GET_FEES] fix test
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>
  • Loading branch information
Andrew Nikitin committed May 23, 2019
1 parent f7bfd86 commit 2949b01
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 23 deletions.
2 changes: 1 addition & 1 deletion devops/Makefile
Expand Up @@ -53,7 +53,7 @@ ifeq ($(SRC_DIR_NAME),sovtoken)
# pypi: indy-plenum
# apt: indy-plenum (stable component)

FPM_P_DEPENDS := indy-node(=1.8.0~dev935)
FPM_P_DEPENDS := indy-node(=1.8.0~dev943)
FPM_ARGS := --no-python-dependencies $(FPM_ARGS)
endif

Expand Down
2 changes: 1 addition & 1 deletion sovtokenfees/sovtokenfees/test/conftest.py
Expand Up @@ -170,7 +170,7 @@ def helpers(
)


@pytest.fixture()
@pytest.fixture(autouse=True)
def reset_fees(helpers):
helpers.node.reset_fees()

Expand Down
40 changes: 40 additions & 0 deletions sovtokenfees/sovtokenfees/test/test_get_fees_from_empty_state.py
@@ -0,0 +1,40 @@
from indy_common.constants import CONFIG_LEDGER_ID

from plenum.common.constants import AUDIT_LEDGER_ID
from sovtokenfees.constants import FEES
from sovtokenfees.domain import build_path_for_set_fees
from sovtokenfees.fees_authorizer import FeesAuthorizer
from sovtokenfees.static_fee_req_handler import StaticFeesReqHandler

from stp_core.loop.eventually import eventually

from plenum.test.txn_author_agreement.helper import check_state_proof

from state.pruning_state import PruningState

from storage.kv_in_memory import KeyValueStorageInMemory


def test_get_fees_when_no_fees_set(helpers, looper):
def _freshness_done():
assert audit_ledger.size == length_after + 1

for n in helpers.node._nodes:
curr_state = n.states[CONFIG_LEDGER_ID]
curr_state.remove(build_path_for_set_fees().encode())
"""
Update config state
"""
primary = helpers.node.get_primary_node()
audit_ledger = primary.getLedger(AUDIT_LEDGER_ID)
length_after = audit_ledger.size
primary.master_replica._do_send_3pc_batch(ledger_id=CONFIG_LEDGER_ID)
looper.run(eventually(_freshness_done))
"""
GET_FEES
"""
response = helpers.general.do_get_fees()
ledger_fees = response[FEES]
assert ledger_fees == {}
check_state_proof(response, build_path_for_set_fees(), None)
helpers.node.assert_set_fees_in_memory({})
21 changes: 0 additions & 21 deletions sovtokenfees/sovtokenfees/test/test_set_get_fees.py
Expand Up @@ -26,27 +26,6 @@
from plenum.test.txn_author_agreement.helper import check_state_proof


def test_get_fees_when_no_fees_set(helpers, looper):
def _freshness_done():
assert audit_ledger.size == length_after + 1
"""
Update config state
"""
primary = helpers.node.get_primary_node()
audit_ledger = primary.getLedger(AUDIT_LEDGER_ID)
length_after = audit_ledger.size
primary.master_replica._do_send_3pc_batch(ledger_id=CONFIG_LEDGER_ID)
looper.run(eventually(_freshness_done))
"""
GET_FEES
"""
response = helpers.general.do_get_fees()
ledger_fees = response[FEES]
assert ledger_fees == {}
check_state_proof(response)
helpers.node.assert_set_fees_in_memory({})


def test_set_fees_invalid_numeric(helpers):
"""
Test set fees with invalid numeric amount.
Expand Down

0 comments on commit 2949b01

Please sign in to comment.