Test: Move common function assert_approx() into util.py
This commit is contained in:
parent
9bf5768dd6
commit
96299a9d6c
3 changed files with 9 additions and 13 deletions
|
@ -25,6 +25,13 @@ logger = logging.getLogger("TestFramework.utils")
|
||||||
# Assert functions
|
# Assert functions
|
||||||
##################
|
##################
|
||||||
|
|
||||||
|
def assert_approx(v, vexp, vspan=0.00001):
|
||||||
|
"""Assert that `v` is within `vspan` of `vexp`"""
|
||||||
|
if v < vexp - vspan:
|
||||||
|
raise AssertionError("%s < [%s..%s]" % (str(v), str(vexp - vspan), str(vexp + vspan)))
|
||||||
|
if v > vexp + vspan:
|
||||||
|
raise AssertionError("%s > [%s..%s]" % (str(v), str(vexp - vspan), str(vexp + vspan)))
|
||||||
|
|
||||||
def assert_fee_amount(fee, tx_size, fee_per_kB):
|
def assert_fee_amount(fee, tx_size, fee_per_kB):
|
||||||
"""Assert the fee was in range"""
|
"""Assert the fee was in range"""
|
||||||
target_fee = round(tx_size * fee_per_kB / 1000, 8)
|
target_fee = round(tx_size * fee_per_kB / 1000, 8)
|
||||||
|
|
|
@ -6,18 +6,12 @@
|
||||||
|
|
||||||
from test_framework.test_framework import BitcoinTestFramework
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
from test_framework.util import (
|
from test_framework.util import (
|
||||||
|
assert_approx,
|
||||||
assert_equal,
|
assert_equal,
|
||||||
assert_raises_rpc_error,
|
assert_raises_rpc_error,
|
||||||
connect_nodes,
|
connect_nodes,
|
||||||
)
|
)
|
||||||
|
|
||||||
# TODO: Copied from wallet_groups.py -- should perhaps move into util.py
|
|
||||||
def assert_approx(v, vexp, vspan=0.00001):
|
|
||||||
if v < vexp - vspan:
|
|
||||||
raise AssertionError("%s < [%s..%s]" % (str(v), str(vexp - vspan), str(vexp + vspan)))
|
|
||||||
if v > vexp + vspan:
|
|
||||||
raise AssertionError("%s > [%s..%s]" % (str(v), str(vexp - vspan), str(vexp + vspan)))
|
|
||||||
|
|
||||||
def reset_balance(node, discardaddr):
|
def reset_balance(node, discardaddr):
|
||||||
'''Throw away all owned coins by the node so it gets a balance of 0.'''
|
'''Throw away all owned coins by the node so it gets a balance of 0.'''
|
||||||
balance = node.getbalance(avoid_reuse=False)
|
balance = node.getbalance(avoid_reuse=False)
|
||||||
|
|
|
@ -7,15 +7,10 @@
|
||||||
from test_framework.test_framework import BitcoinTestFramework
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
from test_framework.messages import CTransaction, FromHex, ToHex
|
from test_framework.messages import CTransaction, FromHex, ToHex
|
||||||
from test_framework.util import (
|
from test_framework.util import (
|
||||||
|
assert_approx,
|
||||||
assert_equal,
|
assert_equal,
|
||||||
)
|
)
|
||||||
|
|
||||||
def assert_approx(v, vexp, vspan=0.00001):
|
|
||||||
if v < vexp - vspan:
|
|
||||||
raise AssertionError("%s < [%s..%s]" % (str(v), str(vexp - vspan), str(vexp + vspan)))
|
|
||||||
if v > vexp + vspan:
|
|
||||||
raise AssertionError("%s > [%s..%s]" % (str(v), str(vexp - vspan), str(vexp + vspan)))
|
|
||||||
|
|
||||||
class WalletGroupTest(BitcoinTestFramework):
|
class WalletGroupTest(BitcoinTestFramework):
|
||||||
def set_test_params(self):
|
def set_test_params(self):
|
||||||
self.setup_clean_chain = True
|
self.setup_clean_chain = True
|
||||||
|
|
Loading…
Add table
Reference in a new issue