From 83867dbbe929dee1d8a721690cc0d96933c0ebd4 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Mon, 4 Nov 2019 09:19:07 +1100 Subject: [PATCH] Move entirely to etcd-io/bbolt --- go.mod | 4 +--- go.sum | 1 + storage/boltPieceCompletion.go | 2 +- storage/bolt_piece.go | 2 +- storage/boltdb.go | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c2298d11..c05b3303 100644 --- a/go.mod +++ b/go.mod @@ -14,11 +14,11 @@ require ( github.com/anacrolix/tagflag v1.0.1 github.com/anacrolix/upnp v0.1.1 github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572 - github.com/boltdb/bolt v1.3.1 github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c github.com/davecgh/go-spew v1.1.1 github.com/dustin/go-humanize v1.0.0 github.com/edsrzf/mmap-go v1.0.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/gosuri/uiprogress v0.0.1 @@ -33,5 +33,3 @@ require ( ) go 1.13 - -replace github.com/boltdb/bolt => github.com/etcd-io/bbolt v1.3.3 diff --git a/go.sum b/go.sum index cc3c9daf..9f717e91 100644 --- a/go.sum +++ b/go.sum @@ -83,6 +83,7 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb github.com/benbjohnson/immutable v0.2.0 h1:t0rW3lNFwfQ85IDO1mhMbumxdVSti4nnVaal4r45Oio= github.com/benbjohnson/immutable v0.2.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2 h1:1B/+1BcRhOMG1KH/YhNIU8OppSWk5d/NGyfRla88CuY= github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c h1:FUUopH4brHNO2kJoNN3pV+OBEYmgraLT/KHZrMM69r0= diff --git a/storage/boltPieceCompletion.go b/storage/boltPieceCompletion.go index 6028cddc..921dd46d 100644 --- a/storage/boltPieceCompletion.go +++ b/storage/boltPieceCompletion.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - bolt "github.com/boltdb/bolt" + bolt "github.com/etcd-io/bbolt" "github.com/anacrolix/torrent/metainfo" ) diff --git a/storage/bolt_piece.go b/storage/bolt_piece.go index 4291a411..179fe3bd 100644 --- a/storage/bolt_piece.go +++ b/storage/bolt_piece.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "github.com/anacrolix/missinggo/x" - bolt "github.com/boltdb/bolt" + bolt "github.com/etcd-io/bbolt" "github.com/anacrolix/torrent/metainfo" ) diff --git a/storage/boltdb.go b/storage/boltdb.go index 5e9bf7bc..045bb600 100644 --- a/storage/boltdb.go +++ b/storage/boltdb.go @@ -6,7 +6,7 @@ import ( "time" "github.com/anacrolix/missinggo/expect" - bolt "github.com/boltdb/bolt" + bolt "github.com/etcd-io/bbolt" "github.com/anacrolix/torrent/metainfo" ) -- 2.48.1