From 7175dba61404471ee84bd7a56044e6d86278611c Mon Sep 17 00:00:00 2001 From: Matt Joiner <anacrolix@gmail.com> Date: Tue, 24 Mar 2020 12:52:33 +1100 Subject: [PATCH] Fix bbolt compatibility with go1.14 --- go.mod | 2 +- go.sum | 6 ++++-- storage/boltPieceCompletion.go | 2 +- storage/bolt_piece.go | 2 +- storage/boltdb.go | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 2ea93d74..969cddf0 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,6 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/edsrzf/mmap-go v1.0.0 github.com/elliotchance/orderedmap v1.2.0 - github.com/etcd-io/bbolt v1.3.3 github.com/fsnotify/fsnotify v1.4.7 github.com/google/btree v1.0.0 github.com/jessevdk/go-flags v1.4.0 @@ -28,6 +27,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.4.0 github.com/tinylib/msgp v1.1.1 // indirect + go.etcd.io/bbolt v1.3.4 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa // indirect golang.org/x/time v0.0.0-20191024005414-555d28b269f0 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 diff --git a/go.sum b/go.sum index 2cb9cad2..5d75a9dc 100644 --- a/go.sum +++ b/go.sum @@ -27,8 +27,6 @@ github.com/anacrolix/dht/v2 v2.0.1/go.mod h1:GbTT8BaEtfqab/LPd5tY41f3GvYeii3mmDU github.com/anacrolix/dht/v2 v2.2.1-0.20191103020011-1dba080fb358 h1:Fji8X0K+FTn9UUupodVCCnQG7wNXETUARGT+8P5s+N0= github.com/anacrolix/dht/v2 v2.2.1-0.20191103020011-1dba080fb358/go.mod h1:d7ARx3WpELh9uOEEr0+8wvQeVTOkPse4UU6dKpv4q0E= github.com/anacrolix/dht/v2 v2.3.2-0.20200103043204-8dce00767ebd/go.mod h1:cgjKyErDnKS6Mej5D1fEqBKg3KwFF2kpFZJp3L6/fGI= -github.com/anacrolix/dht/v2 v2.5.0 h1:AYoGu41z2fellHU9zdFZOQFr8E3epyAGWk6RfOz5UVE= -github.com/anacrolix/dht/v2 v2.5.0/go.mod h1:7RLvyOjm+ZPA7vgFRP+1eRjFzrh27p/nF0VCk5LcjoU= github.com/anacrolix/dht/v2 v2.5.1-0.20200317023935-129f05e9b752 h1:Cg9KyjeymlTOYY+SQ2FeIij9eaZI/eUFprAXYWL0AA8= github.com/anacrolix/dht/v2 v2.5.1-0.20200317023935-129f05e9b752/go.mod h1:7RLvyOjm+ZPA7vgFRP+1eRjFzrh27p/nF0VCk5LcjoU= github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa h1:xCaATLKmn39QqLs3tUZYr6eKvezJV+FYvVOLTklxK6U= @@ -304,6 +302,8 @@ github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8= go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg= +go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -354,6 +354,8 @@ golang.org/x/sys v0.0.0-20191126131656-8a8471f7e56d h1:kCXqdOO2GMlu0vCsEMBXwj/b0 golang.org/x/sys v0.0.0-20191126131656-8a8471f7e56d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 h1:ywK/j/KkyTHcdyYSZNXGjMwgmDSfjglYZ3vStQ/gSCU= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 h1:+DCIGbF/swA92ohVg0//6X2IVY3KZs6p9mix0ziNYJM= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/storage/boltPieceCompletion.go b/storage/boltPieceCompletion.go index 921dd46d..2ad0b4b8 100644 --- a/storage/boltPieceCompletion.go +++ b/storage/boltPieceCompletion.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - bolt "github.com/etcd-io/bbolt" + bolt "go.etcd.io/bbolt" "github.com/anacrolix/torrent/metainfo" ) diff --git a/storage/bolt_piece.go b/storage/bolt_piece.go index c54a25e9..6fa5271d 100644 --- a/storage/bolt_piece.go +++ b/storage/bolt_piece.go @@ -5,7 +5,7 @@ import ( "io" "github.com/anacrolix/missinggo/x" - bolt "github.com/etcd-io/bbolt" + bolt "go.etcd.io/bbolt" "github.com/anacrolix/torrent/metainfo" ) diff --git a/storage/boltdb.go b/storage/boltdb.go index 6e4faddc..015e3d90 100644 --- a/storage/boltdb.go +++ b/storage/boltdb.go @@ -6,7 +6,7 @@ import ( "time" "github.com/anacrolix/missinggo/expect" - bolt "github.com/etcd-io/bbolt" + bolt "go.etcd.io/bbolt" "github.com/anacrolix/torrent/metainfo" ) -- 2.51.0