cerc-io/plugeth-statediff
16
0
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use symmetric difference iterator #11

Merged
roysc merged 27 commits from symmetric-diff-iterator into main 2023-09-20 03:22:19 +00:00
Conversation 1 Commits 27 Files Changed 26 +6 -7
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 24ab6d3680 - Show all commits

3
Makefile
View File

@ -9,7 +9,8 @@ $(MOCKS_DIR)/gen_backend.go:
github.com/openrelayxyz/plugeth-utils/core Backend,Downloader github.com/openrelayxyz/plugeth-utils/core Backend,Downloader
docker-image: mocks docker-image: mocks
docker build . -t "cerc/plugeth-statediff:local" docker build . -t "cerc/plugeth-statediff:local" \
--build-arg GIT_VDBTO_TOKEN=$(CERC_GO_AUTH_TOKEN)
.PHONY: docker-image .PHONY: docker-image
# Local build # Local build

2
scripts/integration-setup.sh
View File

@ -7,7 +7,7 @@ laconic_so="${LACONIC_SO:-laconic-so} --stack fixturenet-plugeth-tx --verbose"
CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}") CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}")
# By default assume we are running in the project root # Point stack-orchestrator to the multi-project root
export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-$(realpath $(git rev-parse --show-toplevel)/..)}" export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-$(realpath $(git rev-parse --show-toplevel)/..)}"
# v5 migrations only go up to version 18 # v5 migrations only go up to version 18

8
utils/iterator_test.go
View File

@ -63,18 +63,16 @@ func TestSymmetricDifferenceIterator(t *testing.T) {
triea.NodeIterator([]byte("jars")), triea.NodeIterator([]byte("jars")),
trieb.NodeIterator(nil)) trieb.NodeIterator(nil))
for di.Next(true) { for di.Next(true) {
t.Errorf("iterator should not yield any elements") t.Errorf("iterator should not yield any elements, but got key %s", di.Path())
t.Logf("%s", di.LeafKey())
} }
assert.Equal(t, 0, *count) assert.Equal(t, 0, *count)
// TODO will fail until merged: https://github.com/ethereum/go-ethereum/pull/27838 // // TODO will fail until merged: https://github.com/ethereum/go-ethereum/pull/27838
// di, count = utils.NewSymmetricDifferenceIterator( // di, count = utils.NewSymmetricDifferenceIterator(
// triea.NodeIterator([]byte("food")), // triea.NodeIterator([]byte("food")),
// trieb.NodeIterator(nil)) // trieb.NodeIterator(nil))
// for di.Next(true) { // for di.Next(true) {
// t.Errorf("iterator should not yield any elements") // t.Errorf("iterator should not yield any elements, but got key %s", di.Path())
// t.Logf("%s", di.LeafKey())
// } // }
// assert.Equal(t, 0, *count) // assert.Equal(t, 0, *count)
}) })