From 2ea72daf4fd498d1a1d891ce971e9bf5078ca8f7 Mon Sep 17 00:00:00 2001
From: gary rong <garyrong0905@gmail.com>
Date: Wed, 29 Jul 2020 18:44:14 +0800
Subject: [PATCH] les: fix unittest (#21382)

# Conflicts:
#	les/fetcher_test.go
---
 to-merge.txt | 90 ----------------------------------------------------
 1 file changed, 90 deletions(-)

diff --git a/to-merge.txt b/to-merge.txt
index e90e42c924..a8f16dc32d 100644
--- a/to-merge.txt
+++ b/to-merge.txt
@@ -379,97 +379,7 @@ Date:   Wed Jul 29 12:47:19 2020 +0200
     
     * remove 65 tests
 
-commit 350a0490ab31cee95b7799d89ed4b10937fa9e0a
-Author: Gary Rong <garyrong0905@gmail.com>
-Date:   Wed Jul 29 18:44:14 2020 +0800
-
-    les: fix unittest (#21382)
-
-commit 37564ceda6719ba4248c2cebbbafca5de4712056
-Author: Robert Zaremba <robert@zaremba.ch>
-Date:   Tue Jul 28 18:16:49 2020 +0200
 
-    miner: refactor helper functions in worker.go (#21044)
-    
-    This reduces complexity of some lengthy functions in worker.go,
-    making the code easier to read.
 
-commit 28c5a8a54badcd058d91efc86e0fe735db506b69
-Author: Gary Rong <garyrong0905@gmail.com>
-Date:   Tue Jul 28 23:02:35 2020 +0800
 
-    les: implement new les fetcher (#20692)
-    
-    * cmd, consensus, eth, les: implement light fetcher
-    
-    * les: address comment
-    
-    * les: address comment
-    
-    * les: address comments
-    
-    * les: check td after delivery
-    
-    * les: add linearExpiredValue for error counter
-    
-    * les: fix import
-    
-    * les: fix dead lock
-    
-    * les: order announces by td
-    
-    * les: encapsulate invalid counter
-    
-    * les: address comment
-    
-    * les: add more checks during the delivery
-    
-    * les: fix log
-    
-    * eth, les: fix lint
-    
-    * eth/fetcher: address comment
-
-commit 298a19bbc69fdef59eb292656b5a3a44c64dc470
-Author: Péter Szilágyi <peterke@gmail.com>
-Date:   Tue Jul 28 17:13:04 2020 +0300
-
-    core: API-less transaction time sorting
-
-commit c47052a580a1b150929de5de5e58b72495fbcbc1
-Author: Hendrik Hofstadt <hendrik@nexantic.com>
-Date:   Wed Jul 22 15:37:44 2020 +0200
-
-    core: sort txs at the same gas price by received time
-
-commit 93da0cf8a19bac578c9bc7da08093a062a676fa3
-Author: Gary Rong <garyrong0905@gmail.com>
-Date:   Tue Jul 28 21:30:31 2020 +0800
-
-    cmd, core, eth, light, trie: dump clean cache periodically (#20391)
-    
-    * cmd, core, eth, light, trie: dump clean cache periodically
-    
-    * eth: update config
-    
-    * trie: minor fix
-    
-    * core, trie: address comments
-    
-    * eth: remove useless
-    
-    * trie: print clean cache dump start too
-    
-    Co-authored-by: Péter Szilágyi <peterke@gmail.com>
-
-commit 79ce5537ab12ec7678b3ea08ecd60faf3a12af01
-Author: 6543 <6543@obermui.de>
-Date:   Tue Jul 28 11:47:05 2020 +0200
-
-    signer/storage: fix a badly ordered error check (#21379)
-
-commit 8e7bee9b56763e94c06e597bf968838e7ea2d03b
-Author: Péter Szilágyi <peterke@gmail.com>
-Date:   Mon Jul 27 14:58:45 2020 +0300
 
-    params: begin v1.9.19 release cycle
-- 
GitLab