Move entirely to etcd-io/bbolt

diff --git a/go.mod b/go.mod
index c2298d1152a2ff262773fec56b26cdd1019d1a8d..c05b330300853009bc6d4cd8bcfcd5fa5a9dcd4a 100644 (file)
--- 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 cc3c9daf88524348d97c432d284fd8dc99405d71..9f717e91d9474fd4ab6515da885e179c694c2aa6 100644 (file)
--- 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 6028cddcf8cf524fb4938ed2a84c0a7d95ffe450..921dd46db4d74ad3ebe8a419335c8ab2690f9611 100644 (file)
--- 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 4291a411e53d6f10049a10a3ede86e4c1d8b187c..179fe3bdab459cddc6b9e6c80f60e78f3d624301 100644 (file)
--- 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 5e9bf7bc9770297c3adb9cba30ccbe30c51d5d89..045bb60052807dfc8119db855bae0256565a3180 100644 (file)
--- 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"
 )