From 828ce2f33e0ab6314fbf8a55d061c63ceb2c5cb3 Mon Sep 17 00:00:00 2001
From: gary rong <garyrong0905@gmail.com>
Date: Wed, 27 May 2020 22:37:37 +0800
Subject: [PATCH] trie: enforce monotonic range in prover and return end marker
(#21130)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* trie: add hasRightElement indicator
* trie: ensure the range is monotonic increasing
* trie: address comment and fix lint
* trie: address comment
* trie: make linter happy
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
# Conflicts:
# trie/proof.go
# trie/proof_test.go
---
to-merge.txt | 45 +--------------------------------------------
1 file changed, 1 insertion(+), 44 deletions(-)
diff --git a/to-merge.txt b/to-merge.txt
index 899399131b..e81e489f2a 100644
--- a/to-merge.txt
+++ b/to-merge.txt
@@ -373,47 +373,4 @@ Date: Wed May 27 22:37:37 2020 +0800
* trie: make linter happy
- Co-authored-by: Péter Szilágyi <peterke@gmail.com>
-
-commit b2c59e297bb302068cbf0b50fccdcda9ba12134e
-Author: sixdays <lj491685571@126.com>
-Date: Wed May 27 22:12:13 2020 +0800
-
- consensus/clique: make internal error private (#21132)
-
- Co-authored-by: linjing <linjingjing@baidu.com>
-
-commit 9219e0fba42d0e73583604cf6b20742b79ba37c7
-Author: Felix Lange <fjl@twurst.com>
-Date: Tue May 26 21:37:37 2020 +0200
-
- eth: interrupt chain insertion on shutdown (#21114)
-
- This adds a new API method on core.BlockChain to allow interrupting
- running data inserts, and calls the method before shutting down the
- downloader.
-
- The BlockChain interrupt checks are now done through a method instead
- of inlining the atomic load everywhere. There is no loss of efficiency from
- this and it makes the interrupt protocol a lot clearer because the check is
- defined next to the method that sets the flag.
-
-commit 4873a9d3c3f78a4346228fcba18257634408d906
-Author: Felix Lange <fjl@twurst.com>
-Date: Tue May 26 13:24:22 2020 +0200
-
- build: upgrade to golangci lint v1.27.0 (#21127)
-
- * build: upgrade to golangci-lint v1.27.0
-
- * build: raise lint timeout to 3 minutes
-
-commit 070a5e1252a3da74eed18a42437ed428648037f6
-Author: Gary Rong <garyrong0905@gmail.com>
-Date: Tue May 26 18:11:29 2020 +0800
-
- trie: fix for range proof (#21107)
-
- * trie: fix for range proof
-
- * trie: fix typo
+ Co-authored-by: Péter Szilágyi <peterke@gmail.com>
\ No newline at end of file
--
GitLab