From fdbd4946c409852964dc896525299e1a8c611340 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 20 Apr 2020 16:50:18 -0700 Subject: [PATCH] build: proper switch to jrick's fork for bbolt --- walletdb/bdb/db.go | 2 +- walletdb/go.mod | 6 ++---- walletdb/go.sum | 10 ++-------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/walletdb/bdb/db.go b/walletdb/bdb/db.go index cf3fc2e2d4..2408fad3f8 100644 --- a/walletdb/bdb/db.go +++ b/walletdb/bdb/db.go @@ -9,7 +9,7 @@ import ( "os" "github.com/btcsuite/btcwallet/walletdb" - "github.com/coreos/bbolt" + "go.etcd.io/bbolt" ) // convertErr converts some bolt errors to the equivalent walletdb error. diff --git a/walletdb/go.mod b/walletdb/go.mod index 937db39734..b42f370986 100644 --- a/walletdb/go.mod +++ b/walletdb/go.mod @@ -4,10 +4,8 @@ go 1.12 require ( github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f - github.com/coreos/bbolt v1.3.3 github.com/davecgh/go-spew v1.1.1 - go.etcd.io/bbolt v1.3.3 // indirect - golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e + go.etcd.io/bbolt v1.3.4 ) -replace go.etcd.io/bbolt v1.3.3 => github.com/jrick/bbolt v1.3.4-0.20200402153132-d6be1a74f54c +replace go.etcd.io/bbolt v1.3.4 => github.com/jrick/bbolt v1.3.4-0.20200402153132-d6be1a74f54c diff --git a/walletdb/go.sum b/walletdb/go.sum index e1a6e602f5..b09d6afa14 100644 --- a/walletdb/go.sum +++ b/walletdb/go.sum @@ -1,14 +1,8 @@ github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= -github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY= -github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/jrick/bbolt v1.3.4-0.20200402153132-d6be1a74f54c h1:QlKIRRKPN51IXeegjP9j2Q1J0I8vKFFOiD4Bv09faq0= github.com/jrick/bbolt v1.3.4-0.20200402153132-d6be1a74f54c/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd h1:DBH9mDw0zluJT/R+nGuV3jWFWLFaHyYZWD4tOT+cjn0= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/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=