mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-20 10:52:25 +00:00
miner: fix test merge issue
This commit is contained in:
parent
2985fa01af
commit
e229be90b0
1 changed files with 5 additions and 4 deletions
|
|
@ -27,6 +27,7 @@ import (
|
||||||
"github.com/ethereum/go-ethereum/core/txpool"
|
"github.com/ethereum/go-ethereum/core/txpool"
|
||||||
"github.com/ethereum/go-ethereum/core/types"
|
"github.com/ethereum/go-ethereum/core/types"
|
||||||
"github.com/ethereum/go-ethereum/crypto"
|
"github.com/ethereum/go-ethereum/crypto"
|
||||||
|
"github.com/holiman/uint256"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestTransactionPriceNonceSortLegacy(t *testing.T) {
|
func TestTransactionPriceNonceSortLegacy(t *testing.T) {
|
||||||
|
|
@ -92,8 +93,8 @@ func testTransactionPriceNonceSort(t *testing.T, baseFee *big.Int) {
|
||||||
Hash: tx.Hash(),
|
Hash: tx.Hash(),
|
||||||
Tx: tx,
|
Tx: tx,
|
||||||
Time: tx.Time(),
|
Time: tx.Time(),
|
||||||
GasFeeCap: tx.GasFeeCap(),
|
GasFeeCap: uint256.MustFromBig(tx.GasFeeCap()),
|
||||||
GasTipCap: tx.GasTipCap(),
|
GasTipCap: uint256.MustFromBig(tx.GasTipCap()),
|
||||||
Gas: tx.Gas(),
|
Gas: tx.Gas(),
|
||||||
BlobGas: tx.BlobGas(),
|
BlobGas: tx.BlobGas(),
|
||||||
})
|
})
|
||||||
|
|
@ -160,8 +161,8 @@ func TestTransactionTimeSort(t *testing.T) {
|
||||||
Hash: tx.Hash(),
|
Hash: tx.Hash(),
|
||||||
Tx: tx,
|
Tx: tx,
|
||||||
Time: tx.Time(),
|
Time: tx.Time(),
|
||||||
GasFeeCap: tx.GasFeeCap(),
|
GasFeeCap: uint256.MustFromBig(tx.GasFeeCap()),
|
||||||
GasTipCap: tx.GasTipCap(),
|
GasTipCap: uint256.MustFromBig(tx.GasTipCap()),
|
||||||
Gas: tx.Gas(),
|
Gas: tx.Gas(),
|
||||||
BlobGas: tx.BlobGas(),
|
BlobGas: tx.BlobGas(),
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue