mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
chore: post-merge-conflict cleanup in test/functional/rpc_blockchain.py
This commit is contained in:
parent
73f28b62a4
commit
4fcc1ab4ce
@ -127,25 +127,6 @@ class BlockchainTest(BitcoinTestFramework):
|
||||
assert res['automatic_pruning']
|
||||
assert_equal(res['prune_target_size'], 576716800)
|
||||
assert_greater_than(res['size_on_disk'], 0)
|
||||
{
|
||||
'testdummy': {
|
||||
'type': 'bip9',
|
||||
'bip9': {
|
||||
'status': 'started',
|
||||
'bit': 28,
|
||||
'start_time': 0,
|
||||
'timeout': 999999999999,
|
||||
'since': 144,
|
||||
'statistics': {
|
||||
'period': 144,
|
||||
'threshold': 108,
|
||||
'elapsed': 57,
|
||||
'count': 57,
|
||||
'possible': True
|
||||
}
|
||||
},
|
||||
'active': False}
|
||||
}
|
||||
assert_equal(res['softforks'], {
|
||||
'bip34': {'type': 'buried', 'active': False, 'height': 500},
|
||||
'bip66': {'type': 'buried', 'active': False, 'height': 1251},
|
||||
|
Loading…
Reference in New Issue
Block a user