resolve remaining conflicts

Author: Baptiste Boussemart

cmd/devp2p/internal/ethtest/chain.go

@@ -22,14 +22,14 @@ type Chain struct {
 	chainConfig *params.ChainConfig
 }
 
-func (c *Chain) WriteTo(writer io.Writer) error {
+func (c *Chain) WriteTo(writer io.Writer) (int64, error) {
 	for _, block := range c.blocks {
 		if err := rlp.Encode(writer, block); err != nil {
-			return err
+			return 0, err
 		}
 	}
 
-	return nil
+	return 0, nil // TODO(bbo): size
 }
 
 // Len returns the length of the chain.

eth/downloader/downloader.go

@@ -2079,7 +2079,7 @@ func (d *Downloader) syncWithPeerUntil(p *peerConnection, hash common.Hash, td *
 	if localHeight == 0 && frozen > 0 {
 		// statedb was removed and is being recovered now
 		// we trust the peer height and sync upto that
-		remoteHeader, err = d.fetchHeight(p)
+		remoteHeader, _, err = d.fetchHead(p) // #21529
 	} else {
 		remoteHeader, err = d.fetchHeader(p, hash)
 	}
@@ -2101,13 +2101,11 @@ func (d *Downloader) syncWithPeerUntil(p *peerConnection, hash common.Hash, td *
 		d.syncInitHook(localHeight, remoteHeight)
 	}
 
-	pivot := uint64(0)
-
 	fetchers := []func() error{
 		func() error { return d.fetchBoundedHeaders(p, localHeight+1, remoteHeight) },
 		func() error { return d.fetchBodies(localHeight + 1) },
-		func() error { return d.fetchReceipts(localHeight + 1) }, // Receipts are only retrieved during fast sync
-		func() error { return d.processHeaders(localHeight+1, pivot, td) },
+		func() error { return d.fetchReceipts(localHeight + 1) },    // Receipts are only retrieved during fast sync
+		func() error { return d.processHeaders(localHeight+1, td) }, // #21529
 		d.processFullSyncContent, //This must be added to clear the buffer of downloaded content as it's being filled
 	}
 	return d.spawnSync(fetchers)

go.mod

@@ -31,7 +31,6 @@ require (
 	github.com/dlclark/regexp2 v1.2.0 // indirect
 	github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf
 	github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498
-	github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813 // indirect
 	github.com/eapache/channels v1.1.0
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c
@@ -85,7 +84,6 @@ require (
 	github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/mobile v0.0.0-20200801112145-973feb4309de // indirect
 	golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
 	golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8
 	golang.org/x/text v0.3.3

miner/miner_test.go

@@ -24,11 +24,13 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus/ethash"
 	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/mps"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/eth/downloader"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/ethdb/memorydb"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/params"
@@ -38,8 +40,11 @@ import (
 type mockBackend struct {
 	bc     *core.BlockChain
 	txPool *core.TxPool
+	db     ethdb.Database
 }
 
+var _ Backend = &mockBackend{} // check implementation
+
 func NewMockBackend(bc *core.BlockChain, txPool *core.TxPool) *mockBackend {
 	return &mockBackend{
 		bc:     bc,
@@ -55,8 +60,13 @@ func (m *mockBackend) TxPool() *core.TxPool {
 	return m.txPool
 }
 
+func (m *mockBackend) ChainDb() ethdb.Database {
+	return m.db
+}
+
 type testBlockChain struct {
-	statedb       *state.StateDB
+	statedb *state.StateDB
+
 	gasLimit      uint64
 	chainHeadFeed *event.Feed
 }
@@ -71,8 +81,8 @@ func (bc *testBlockChain) GetBlock(hash common.Hash, number uint64) *types.Block
 	return bc.CurrentBlock()
 }
 
-func (bc *testBlockChain) StateAt(common.Hash) (*state.StateDB, error) {
-	return bc.statedb, nil
+func (bc *testBlockChain) StateAt(common.Hash) (*state.StateDB, mps.PrivateStateRepository, error) {
+	return bc.statedb, nil, nil
 }
 
 func (bc *testBlockChain) SubscribeChainHeadEvent(ch chan<- core.ChainHeadEvent) event.Subscription {

p2p/server_test.go

@@ -38,7 +38,6 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/rlpx"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/crypto/sha3"
 )
 
 type testTransport struct {
@@ -471,7 +470,7 @@ func TestServerSetupConn_whenNotInRaftCluster(t *testing.T) {
 			PrivateKey:  srvkey,
 			NoDiscovery: true,
 		},
-		newTransport: func(fd net.Conn) transport { return newTestTransport(clientpub, fd) },
+		newTransport: func(fd net.Conn, key *ecdsa.PublicKey) transport { return newTestTransport(clientpub, fd, key) },
 		log:          log.New(),
 		checkPeerInRaft: func(node *enode.Node) bool {
 			return false
@@ -511,7 +510,7 @@ func TestServerSetupConn_whenNotPermissioned(t *testing.T) {
 			DataDir:              tmpDir,
 			EnableNodePermission: true,
 		},
-		newTransport: func(fd net.Conn) transport { return newTestTransport(clientpub, fd) },
+		newTransport: func(fd net.Conn, key *ecdsa.PublicKey) transport { return newTestTransport(clientpub, fd, key) },
 		log:          log.New(),
 	}
 	if err := srv.Start(); err != nil {