aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-08-17 15:20:15 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-08-17 15:20:15 -0500
commit50c8147568eec4e1434b9b87cb7f9421920481bd (patch)
treeaca78e8ce0b6341fb0d0fa8d0f57853f43d15cac
parentMerge pull request #5756 (diff)
parentfunctional_tests: add get_fee_estimate to blockchain test (diff)
downloadmonero-50c8147568eec4e1434b9b87cb7f9421920481bd.tar.xz
Merge pull request #5490
1a93aa4 functional_tests: add get_fee_estimate to blockchain test (moneromooo-monero)
-rwxr-xr-xtests/functional_tests/blockchain.py12
-rw-r--r--utils/python-rpc/framework/daemon.py11
2 files changed, 23 insertions, 0 deletions
diff --git a/tests/functional_tests/blockchain.py b/tests/functional_tests/blockchain.py
index 2bd7672c0..2c3f34c35 100755
--- a/tests/functional_tests/blockchain.py
+++ b/tests/functional_tests/blockchain.py
@@ -78,6 +78,12 @@ class BlockchainTest():
except: ok = True
assert ok
+ res = daemon.get_fee_estimate()
+ assert res.fee == 234562
+ assert res.quantization_mask == 10000
+ res = daemon.get_fee_estimate(10)
+ assert res.fee <= 234562
+
# generate blocks
res_generateblocks = daemon.generateblocks('42ey1afDFnn4886T7196doS9GPMzexD9gXpsZJDwVjeRVdFCSoHnv7KPbBeGpzJBzHRCAs9UxqeoyFQMYbqSWYTfJJQAWDm', blocks)
@@ -229,6 +235,12 @@ class BlockchainTest():
assert res.histogram[i].unlocked_instances == 0
assert res.histogram[i].recent_instances == 0
+ res = daemon.get_fee_estimate()
+ assert res.fee == 234560
+ assert res.quantization_mask == 10000
+ res = daemon.get_fee_estimate(10)
+ assert res.fee <= 234560
+
def _test_alt_chains(self):
print('Testing alt chains')
daemon = Daemon()
diff --git a/utils/python-rpc/framework/daemon.py b/utils/python-rpc/framework/daemon.py
index 20967030a..23d5ec0f0 100644
--- a/utils/python-rpc/framework/daemon.py
+++ b/utils/python-rpc/framework/daemon.py
@@ -333,3 +333,14 @@ class Daemon(object):
'id': '0'
}
return self.rpc.send_json_rpc_request(get_alternate_chains)
+
+ def get_fee_estimate(self, grace_blocks = 0):
+ get_fee_estimate = {
+ 'method': 'get_fee_estimate',
+ 'params': {
+ 'grace_blocks': grace_blocks,
+ },
+ 'jsonrpc': '2.0',
+ 'id': '0'
+ }
+ return self.rpc.send_json_rpc_request(get_fee_estimate)