Skip to content

Commit

Permalink
go.mod: replace bbolt with a fixed branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@dajohi
dajohi committed Feb 27, 2020
1 parent 35b1720 commit f5a5ee2
Show file tree
Hide file tree
Showing 27 changed files with 34 additions and 30 deletions.
4 changes: 3 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/decred/dcrpool
go 1.12

require (
github.com/coreos/bbolt v1.3.3
github.com/davecgh/go-spew v1.1.1
github.com/decred/base58 v1.0.2 // indirect
github.com/decred/dcrd/blockchain/standalone v1.1.0
Expand All @@ -18,6 +17,7 @@ require (
github.com/decred/dcrwallet/rpc/walletrpc v0.3.0
github.com/decred/dcrwallet/wallet/v3 v3.1.0
github.com/decred/slog v1.0.0
github.com/etcd-io/bbolt v1.3.3
github.com/gorilla/csrf v1.6.2
github.com/gorilla/mux v1.7.3
github.com/gorilla/sessions v1.2.0
Expand All @@ -28,3 +28,5 @@ require (
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
google.golang.org/grpc v1.26.0
)

replace go.etcd.io/bbolt => github.com/jrick/bbolt v1.3.4-0.20200208065811-52cf6d0e86ee
10 changes: 6 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ github.com/btcsuite/snappy-go v1.0.0 h1:ZxaA6lo2EpxGddsA8JwWOcxlzRybb444sgmeJQMJ
github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
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.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
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=
Expand Down Expand Up @@ -102,6 +100,8 @@ github.com/decred/slog v1.0.0 h1:Dl+W8O6/JH6n2xIFN2p3DNjCmjYwvrXsjlSJTQQ4MhE=
github.com/decred/slog v1.0.0/go.mod h1:zR98rEZHSnbZ4WHZtO0iqmSZjDLKhkXfrPTZQKtAonQ=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/etcd-io/bbolt v1.3.3 h1:gSJmxrs37LgTqR/oyJBWok6k6SvXEUerFTbltIhXkBM=
github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
Expand All @@ -127,6 +127,8 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jrick/bbolt v1.3.4-0.20200208065811-52cf6d0e86ee h1:SwADIK34vnajOFFkQyrXyKO4+uWXwKmzS5+4TYeG+js=
github.com/jrick/bbolt v1.3.4-0.20200208065811-52cf6d0e86ee/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
github.com/jrick/bitset v1.0.0/go.mod h1:ZOYB5Uvkla7wIEY4FEssPVi3IQXa02arznRaYaAEPe4=
github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI=
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
Expand All @@ -148,8 +150,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down Expand Up @@ -180,6 +180,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/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 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
Expand Down
2 changes: 1 addition & 1 deletion pool/acceptedwork.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"time"

bolt "github.com/coreos/bbolt"
bolt "github.com/etcd-io/bbolt"
)

// AcceptedWork represents an accepted work submission to the network.
Expand Down
2 changes: 1 addition & 1 deletion pool/acceptedwork_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

bolt "github.com/coreos/bbolt"
bolt "github.com/etcd-io/bbolt"
)

func persistAcceptedWork(db *bolt.DB, blockHash string, prevHash string,
Expand Down
2 changes: 1 addition & 1 deletion pool/account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"fmt"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
"github.com/decred/dcrd/crypto/blake256"
"github.com/decred/dcrd/dcrutil/v2"
bolt "github.com/etcd-io/bbolt"
)

// Account represents a mining pool account.
Expand Down
2 changes: 1 addition & 1 deletion pool/account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
bolt "github.com/etcd-io/bbolt"
)

func persistAccount(db *bolt.DB, address string, activeNet *chaincfg.Params) (*Account, error) {
Expand Down
2 changes: 1 addition & 1 deletion pool/chainstate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"sync"
"sync/atomic"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/dcrutil/v2"
"github.com/decred/dcrd/wire"
bolt "github.com/etcd-io/bbolt"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pool/chainstate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"sync"
"testing"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/dcrutil/v2"
"github.com/decred/dcrd/wire"
bolt "github.com/etcd-io/bbolt"
)

func testChainState(t *testing.T, db *bolt.DB) {
Expand Down
2 changes: 1 addition & 1 deletion pool/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"sync/atomic"
"time"

bolt "github.com/coreos/bbolt"
"github.com/davecgh/go-spew/spew"
"github.com/decred/dcrd/blockchain/standalone"
"github.com/decred/dcrd/chaincfg/v2"
"github.com/decred/dcrd/wire"
bolt "github.com/etcd-io/bbolt"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pool/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"testing"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
bolt "github.com/etcd-io/bbolt"
)

func testClient(t *testing.T, db *bolt.DB) {
Expand Down
2 changes: 1 addition & 1 deletion pool/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"time"

bolt "github.com/coreos/bbolt"
bolt "github.com/etcd-io/bbolt"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pool/db_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"testing"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
bolt "github.com/etcd-io/bbolt"
)

func testInitDB(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pool/endpoint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"sync"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
bolt "github.com/etcd-io/bbolt"
)

type EndpointConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion pool/endpoint_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"testing"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
bolt "github.com/etcd-io/bbolt"
)

func makeConn(listener *net.TCPListener, serverCh chan net.Conn) (net.Conn, net.Conn, error) {
Expand Down
2 changes: 1 addition & 1 deletion pool/hub.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"sync/atomic"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v2"
"github.com/decred/dcrd/dcrutil/v2"
"github.com/decred/dcrd/rpcclient/v5"
"github.com/decred/dcrd/wire"
"github.com/decred/dcrwallet/rpc/walletrpc"
bolt "github.com/etcd-io/bbolt"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)
Expand Down
2 changes: 1 addition & 1 deletion pool/hub_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"testing"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
"github.com/decred/dcrd/dcrutil/v2"
bolt "github.com/etcd-io/bbolt"
)

func testHub(t *testing.T, db *bolt.DB) {
Expand Down
2 changes: 1 addition & 1 deletion pool/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"fmt"
"time"

bolt "github.com/coreos/bbolt"
bolt "github.com/etcd-io/bbolt"
)

// Job represents cached copies of work delivered to clients.
Expand Down
2 changes: 1 addition & 1 deletion pool/job_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

bolt "github.com/coreos/bbolt"
bolt "github.com/etcd-io/bbolt"
)

func persistJob(db *bolt.DB, header string, height uint32) (*Job, error) {
Expand Down
2 changes: 1 addition & 1 deletion pool/payment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"fmt"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/dcrutil/v2"
bolt "github.com/etcd-io/bbolt"
)

// Payment represents an outstanding payment for a pool account.
Expand Down
2 changes: 1 addition & 1 deletion pool/payment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/dcrutil/v2"
bolt "github.com/etcd-io/bbolt"
)

// makePaymentBundle creates a new payment bundle.
Expand Down
2 changes: 1 addition & 1 deletion pool/paymentmgr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"sync/atomic"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
"github.com/decred/dcrd/dcrutil/v2"
"github.com/decred/dcrd/mempool/v3"
txrules "github.com/decred/dcrwallet/wallet/v3/txrules"
bolt "github.com/etcd-io/bbolt"
)

type PaymentMgrConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion pool/paymentmgr_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
"github.com/decred/dcrd/dcrutil/v2"
bolt "github.com/etcd-io/bbolt"
)

func testPaymentMgr(t *testing.T, db *bolt.DB) {
Expand Down
2 changes: 1 addition & 1 deletion pool/pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"os"
"testing"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
"github.com/decred/dcrd/dcrutil/v2"
bolt "github.com/etcd-io/bbolt"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pool/share.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"math/big"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
"github.com/decred/dcrd/dcrutil/v2"
bolt "github.com/etcd-io/bbolt"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pool/share_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"testing"
"time"

bolt "github.com/coreos/bbolt"
"github.com/decred/dcrd/chaincfg/v2"
bolt "github.com/etcd-io/bbolt"
)

// persistShare creates a persisted share with the provided account, share
Expand Down
2 changes: 1 addition & 1 deletion pool/upgrades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"

bolt "github.com/coreos/bbolt"
bolt "github.com/etcd-io/bbolt"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pool/upgrades_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"
"testing"

bolt "github.com/coreos/bbolt"
bolt "github.com/etcd-io/bbolt"
)

var dbUpgradeTests = [...]struct {
Expand Down

0 comments on commit f5a5ee2

Please sign in to comment.