From 60bb77b25df93b001c2f7b7bc635cc8182ae6f87 Mon Sep 17 00:00:00 2001
From: yaoandrew <1547809+yaoandrew@users.noreply.github.com>
Date: Fri, 21 Feb 2020 10:16:21 -0800
Subject: [PATCH] Clean up after merge

---
 core/blockchain.go | 14 --------------
 p2p/server.go      |  3 ---
 2 files changed, 17 deletions(-)

diff --git a/core/blockchain.go b/core/blockchain.go
index 8004065a4..87d5a6d43 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1981,20 +1981,6 @@ func (bc *BlockChain) reorg(oldBlock, newBlock *types.Block) error {
 			}
 			return ret
 		}
-		// mergeLogs returns a merged log slice with specified sort order.
-		mergeLogs = func(logs [][]*types.Log, reverse bool) []*types.Log {
-			var ret []*types.Log
-			if reverse {
-				for i := len(logs) - 1; i >= 0; i-- {
-					ret = append(ret, logs[i]...)
-				}
-			} else {
-				for i := 0; i < len(logs); i++ {
-					ret = append(ret, logs[i]...)
-				}
-			}
-			return ret
-		}
 	)
 	// Reduce the longer chain to the same number as the shorter one
 	if oldBlock.NumberU64() > newBlock.NumberU64() {
diff --git a/p2p/server.go b/p2p/server.go
index 56012cb84..c87b7758d 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -758,9 +758,6 @@ running:
 				if p.Inbound() {
 					inboundCount++
 				}
-				if conn, ok := c.fd.(*meteredConn); ok {
-					conn.handshakeDone(p)
-				}
 			}
 			c.cont <- err