fix merge conflicts

ygaberman-px · May 1, 2023 · 5d2436c · 5d2436c
1 parent 5a18acb
commit 5d2436c
Show file tree

Hide file tree

Showing 36 changed files with 9 additions and 4,059 deletions.
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
@@ -129,7 +129,7 @@ func (b *SimulatedBackend) Commit() common.Hash {
 
 	blocks, _ := core.GenerateChain(b.config, parentBlock, ethash.NewFaker(), b.database, 1,
 		func(number int, block *core.BlockGen) {
-			for _, tx := range append(b.pendingBlock.Transactions(), b.stuckTransactions...) {
+			for _, tx := range b.pendingBlock.Transactions() {
 				if b.marketGasPrice == nil || b.marketGasPrice.Cmp(tx.GasPrice()) <= 0 {
 					block.AddTxWithChain(b.blockchain, tx)
 				} else {

diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go
@@ -27,9 +27,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"

diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go