From dd97b6e652916c9fe5f94f88577d2370b2f3906c Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Tue, 28 May 2024 12:41:20 +0700 Subject: [PATCH 1/2] save --- erigon-lib/go.mod | 2 +- erigon-lib/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index 02c1e2fd728..6e07b6fe9f9 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/erigontech/mdbx-go v0.38.0 - github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240525204604-836281a82386 + github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240528053943-d59061a50733 github.com/ledgerwatch/interfaces v0.0.0-20240517122128-635f85ab7b28 github.com/ledgerwatch/log/v3 v3.9.0 github.com/ledgerwatch/secp256k1 v1.0.0 diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 250ee4a3d32..f1b3d29f251 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -278,8 +278,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= 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-snapshot v1.3.1-0.20240525204604-836281a82386 h1:adTkEpO45QXRKFz7k5Dc1nqSJifJPqw6y66Yh+7VpY0= -github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240525204604-836281a82386/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= +github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240528053943-d59061a50733 h1:mdo0zmn/C40YIKEBEiEfrVANJR/6sDBKc6xRFpZgPa0= +github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240528053943-d59061a50733/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= github.com/ledgerwatch/interfaces v0.0.0-20240517122128-635f85ab7b28 h1:+78uIBEvHKD84bD0y9F2w1ctyj8EbkcYlyGXjGmjYLU= github.com/ledgerwatch/interfaces v0.0.0-20240517122128-635f85ab7b28/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc= github.com/ledgerwatch/log/v3 v3.9.0 h1:iDwrXe0PVwBC68Dd94YSsHbMgQ3ufsgjzXtFNFVZFRk= diff --git a/go.mod b/go.mod index e962ba99390..df4ef4ab83e 100644 --- a/go.mod +++ b/go.mod @@ -186,7 +186,7 @@ require ( github.com/koron/go-ssdp v0.0.4 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240525204604-836281a82386 // indirect + github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240528053943-d59061a50733 // indirect github.com/ledgerwatch/erigonwatch v0.1.0 github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-flow-metrics v0.1.0 // indirect diff --git a/go.sum b/go.sum index 816d7e580a5..62d0f7e6316 100644 --- a/go.sum +++ b/go.sum @@ -541,8 +541,8 @@ github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3P github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= 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-snapshot v1.3.1-0.20240525204604-836281a82386 h1:adTkEpO45QXRKFz7k5Dc1nqSJifJPqw6y66Yh+7VpY0= -github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240525204604-836281a82386/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= +github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240528053943-d59061a50733 h1:mdo0zmn/C40YIKEBEiEfrVANJR/6sDBKc6xRFpZgPa0= +github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240528053943-d59061a50733/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= github.com/ledgerwatch/erigonwatch v0.1.0 h1:TrCjklOu9ZI9/uiMigo1Jnknnk1I/dXUxXymA3xHfzo= github.com/ledgerwatch/erigonwatch v0.1.0/go.mod h1:uYq4hs3RL1OtIYRXAxYq02tpdGkx6rtXlpzdazDDbWI= github.com/ledgerwatch/log/v3 v3.9.0 h1:iDwrXe0PVwBC68Dd94YSsHbMgQ3ufsgjzXtFNFVZFRk= From 38496b070d693bca0e10b1c87b88e8b0b0189184 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Tue, 28 May 2024 14:23:10 +0700 Subject: [PATCH 2/2] save --- erigon-lib/kv/kvcache/cache_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erigon-lib/kv/kvcache/cache_test.go b/erigon-lib/kv/kvcache/cache_test.go index 0d7f0fc0e4a..eda0430cccc 100644 --- a/erigon-lib/kv/kvcache/cache_test.go +++ b/erigon-lib/kv/kvcache/cache_test.go @@ -19,6 +19,7 @@ import ( "context" "encoding/binary" "fmt" + "runtime" "sync" "sync/atomic" "testing" @@ -169,6 +170,9 @@ func TestEviction(t *testing.T) { } func TestAPI(t *testing.T) { + if runtime.GOOS == "windows" { + t.Skip("fix me on win please") + } require := require.New(t) c := New(DefaultCoherentConfig) k1, k2 := [20]byte{1}, [20]byte{2}