sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#23210: Replace satoshi_round with int() or Decimal()

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2021-10-06 15:19:34 +02:00
parent 739394df18
commit 851dae7b29
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/feature_bip68_sequence.py
View File

@ -21,7 +21,6 @@ from test_framework.util import (
assert_equal, assert_equal,
assert_greater_than, assert_greater_than,
assert_raises_rpc_error, assert_raises_rpc_error,
satoshi_round,
softfork_active, softfork_active,
) )
from test_framework.script_util import DUMMY_P2SH_SCRIPT from test_framework.script_util import DUMMY_P2SH_SCRIPT
@ -91,7 +90,7 @@ class BIP68Test(BitcoinTestFramework):
utxo = utxos[0] utxo = utxos[0]
tx1 = CTransaction() tx1 = CTransaction()
value = int(satoshi_round(utxo["amount"] - self.relayfee)*COIN) value = int((utxo["amount"] - self.relayfee) * COIN)
# Check that the disable flag disables relative locktime. # Check that the disable flag disables relative locktime.
# If sequence locks were used, this would require 1 block for the # If sequence locks were used, this would require 1 block for the

9
test/functional/mempool_packages.py
View File

@ -14,7 +14,6 @@ from test_framework.util import (
assert_equal, assert_equal,
assert_raises_rpc_error, assert_raises_rpc_error,
chain_transaction, chain_transaction,
satoshi_round,
) )
# default limits # default limits
@ -190,10 +189,10 @@ class MempoolPackagesTest(BitcoinTestFramework):
entry = self.nodes[0].getmempoolentry(x) entry = self.nodes[0].getmempoolentry(x)
descendant_fees += entry['fee'] descendant_fees += entry['fee']
if (x == chain[-1]): if (x == chain[-1]):
assert_equal(entry['modifiedfee'], entry['fee']+satoshi_round(0.00002)) assert_equal(entry['modifiedfee'], entry['fee'] + Decimal("0.00002"))
assert_equal(entry['fees']['modified'], entry['fee']+satoshi_round(0.00002)) assert_equal(entry['fees']['modified'], entry['fee'] + Decimal("0.00002"))
assert_equal(entry['descendantfees'], descendant_fees * COIN + 2000) assert_equal(entry['descendantfees'], descendant_fees * COIN + 2000)
assert_equal(entry['fees']['descendant'], descendant_fees+satoshi_round(0.00002)) assert_equal(entry['fees']['descendant'], descendant_fees + Decimal("0.00002"))
# Check that node1's mempool is as expected (-> custom ancestor limit) # Check that node1's mempool is as expected (-> custom ancestor limit)
mempool0 = self.nodes[0].getrawmempool(False) mempool0 = self.nodes[0].getrawmempool(False)
@ -289,7 +288,7 @@ class MempoolPackagesTest(BitcoinTestFramework):
value = utxo[0]['amount'] value = utxo[0]['amount']
vout = utxo[0]['vout'] vout = utxo[0]['vout']
send_value = satoshi_round((value - fee)/2) send_value = (value - fee) / 2
inputs = [ {'txid' : txid, 'vout' : vout} ] inputs = [ {'txid' : txid, 'vout' : vout} ]
outputs = {} outputs = {}
for _ in range(2): for _ in range(2):

8
test/functional/test_framework/wallet.py
View File

@ -31,7 +31,6 @@ from test_framework.script import (
from test_framework.util import ( from test_framework.util import (
assert_equal, assert_equal,
assert_greater_than_or_equal, assert_greater_than_or_equal,
satoshi_round,
) )
DEFAULT_FEE = Decimal("0.0001") DEFAULT_FEE = Decimal("0.0001")
@ -162,13 +161,12 @@ class MiniWallet:
vsize = Decimal(85) # anyone-can-spend vsize = Decimal(85) # anyone-can-spend
else: else:
vsize = Decimal(168) # P2PK (73 bytes scriptSig + 35 bytes scriptPubKey + 60 bytes other) vsize = Decimal(168) # P2PK (73 bytes scriptSig + 35 bytes scriptPubKey + 60 bytes other)
send_value = satoshi_round(utxo_to_spend['value'] - fee_rate * (vsize / 1000)) send_value = int(COIN * (utxo_to_spend['value'] - fee_rate * (vsize / 1000)))
fee = utxo_to_spend['value'] - send_value
assert send_value > 0 assert send_value > 0
tx = CTransaction() tx = CTransaction()
tx.vin = [CTxIn(COutPoint(int(utxo_to_spend['txid'], 16), utxo_to_spend['vout']), nSequence=sequence)] tx.vin = [CTxIn(COutPoint(int(utxo_to_spend['txid'], 16), utxo_to_spend['vout']), nSequence=sequence)]
tx.vout = [CTxOut(int(send_value * COIN), self._scriptPubKey)] tx.vout = [CTxOut(send_value, self._scriptPubKey)]
tx.nLockTime = locktime tx.nLockTime = locktime
if not self._address: if not self._address:
# raw script # raw script
@ -186,7 +184,7 @@ class MiniWallet:
assert_equal(mempool_valid, tx_info['allowed']) assert_equal(mempool_valid, tx_info['allowed'])
if mempool_valid: if mempool_valid:
assert_equal(len(tx_hex) // 2, vsize) # 1 byte = 2 character assert_equal(len(tx_hex) // 2, vsize) # 1 byte = 2 character
assert_equal(tx_info['fees']['base'], fee) assert_equal(tx_info['fees']['base'], utxo_to_spend['value'] - Decimal(send_value) / COIN)
return {'txid': tx_info['txid'], 'hex': tx_hex, 'tx': tx} return {'txid': tx_info['txid'], 'hex': tx_hex, 'tx': tx}
def sendrawtransaction(self, *, from_node, tx_hex): def sendrawtransaction(self, *, from_node, tx_hex):