reverted Elias-Fano merge (#5546)

* reverted ef merge

* skip ef merge test

* Update to main

Co-authored-by: Alexey Sharp <alexeysharp@Alexeys-iMac.local>
This commit is contained in:
awskii 2022-09-27 18:12:11 +01:00 committed by GitHub
parent 11893429f5
commit c2655ad6ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

4
go.mod
View File

@ -4,7 +4,7 @@ go 1.18
require (
github.com/gballet/go-verkle v0.0.0-20220722103930-acd34254ebff
github.com/ledgerwatch/erigon-lib v0.0.0-20220926145924-4f5232504fdf
github.com/ledgerwatch/erigon-lib v0.0.0-20220927105429-e1860348b274
github.com/ledgerwatch/erigon-snapshot v1.0.1-0.20220913092204-de54ee30c7b9
github.com/ledgerwatch/log/v3 v3.4.2
github.com/ledgerwatch/secp256k1 v1.0.0
@ -54,6 +54,7 @@ require (
github.com/pelletier/go-toml v1.9.5
github.com/pelletier/go-toml/v2 v2.0.5
github.com/pion/stun v0.3.5
github.com/prysmaticlabs/fastssz v0.0.0-20220628131814-351fdcbb9964
github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7
github.com/quasilyte/go-ruleguard/dsl v0.3.21
github.com/rs/cors v1.8.2
@ -145,7 +146,6 @@ require (
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prysmaticlabs/fastssz v0.0.0-20220628131814-351fdcbb9964 // indirect
github.com/prysmaticlabs/gohashtree v0.0.0-20220517220438-192ee5ae6982 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect

4
go.sum
View File

@ -556,8 +556,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3PYPwICLl+/9oulQauOuETfgFvhBDffs0=
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
github.com/ledgerwatch/erigon-lib v0.0.0-20220926145924-4f5232504fdf h1:JBqN8YXlG9iEbY7Uhc4qrLmwbqbDkJ51PUmRrEITYoU=
github.com/ledgerwatch/erigon-lib v0.0.0-20220926145924-4f5232504fdf/go.mod h1:nMyol2RVCPF0TSR/VU4bK40JB35R/Q+IdodGW8j1kzU=
github.com/ledgerwatch/erigon-lib v0.0.0-20220927105429-e1860348b274 h1:uxS/Fefrhj/RuiyEhhG36KsTAk+3pzMx3p3+lA8sH5Y=
github.com/ledgerwatch/erigon-lib v0.0.0-20220927105429-e1860348b274/go.mod h1:nMyol2RVCPF0TSR/VU4bK40JB35R/Q+IdodGW8j1kzU=
github.com/ledgerwatch/erigon-snapshot v1.0.1-0.20220913092204-de54ee30c7b9 h1:iWjzYLtOsp/Wpo9ZWV/eMIlnFzk8bm7POSzrXAILw24=
github.com/ledgerwatch/erigon-snapshot v1.0.1-0.20220913092204-de54ee30c7b9/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo=
github.com/ledgerwatch/log/v3 v3.4.2 h1:chvjB7c100rlIFgPv+Col2eerxIrHL88OiZRuPZDkxw=