From 18cb320f15aad7d1ec9b42e6d7833af76b7f6843 Mon Sep 17 00:00:00 2001 From: Victor Castell Date: Wed, 19 Oct 2022 10:46:43 +0200 Subject: [PATCH] Move boltdb to bbolt repo (#222) * Move boltdb to bbolt repo This is a maintained fork. * Go sum * Try with higher timeout --- blocktracker/blocktracker_test.go | 2 +- go.mod | 4 ++-- go.sum | 4 ++++ tracker/store/boltdb/bolt_store.go | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/blocktracker/blocktracker_test.go b/blocktracker/blocktracker_test.go index 8ccb8dde..f950bf28 100644 --- a/blocktracker/blocktracker_test.go +++ b/blocktracker/blocktracker_test.go @@ -35,7 +35,7 @@ func testListener(t *testing.T, server *testutil.TestServer, tracker BlockTracke if block.Number != count { t.Fatal("bad number") } - case <-time.After(2 * time.Second): + case <-time.After(4 * time.Second): t.Fatal("timeout") } } diff --git a/go.mod b/go.mod index 40a2289c..7094a245 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/umbracle/ethgo go 1.18 require ( - github.com/boltdb/bolt v1.3.1 github.com/btcsuite/btcd v0.22.1 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce github.com/gorilla/websocket v1.4.1 @@ -16,6 +15,7 @@ require ( github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722 github.com/valyala/fasthttp v1.4.0 github.com/valyala/fastjson v1.4.1 + go.etcd.io/bbolt v1.3.6 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad golang.org/x/text v0.3.2 ) @@ -46,7 +46,7 @@ require ( github.com/sirupsen/logrus v1.4.2 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 // indirect - golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect + golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d // indirect google.golang.org/appengine v1.6.5 // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v2 v2.2.2 // indirect diff --git a/go.sum b/go.sum index 91dd4812..fc0237cb 100644 --- a/go.sum +++ b/go.sum @@ -116,6 +116,8 @@ github.com/valyala/fasthttp v1.4.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk github.com/valyala/fastjson v1.4.1 h1:hrltpHpIpkaxll8QltMU8c3QZ5+qIiCL8yKqPFJI/yE= github.com/valyala/fastjson v1.4.1/go.mod h1:nV6MsjxL2IMJQUoHDIrjEI7oLyeqK6aBD7EFWPsvP8o= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -138,6 +140,8 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73IhgqJ71c9s80WsQnh0Es= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= diff --git a/tracker/store/boltdb/bolt_store.go b/tracker/store/boltdb/bolt_store.go index a6a2620d..1340bab2 100644 --- a/tracker/store/boltdb/bolt_store.go +++ b/tracker/store/boltdb/bolt_store.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/binary" - "github.com/boltdb/bolt" "github.com/umbracle/ethgo" "github.com/umbracle/ethgo/tracker/store" + bolt "go.etcd.io/bbolt" ) var _ store.Store = (*BoltStore)(nil)