Skip to content

Commit

Permalink
Merge commit 'refs/pull/5/head' of github.com:digitalbitbox/block-cli…
Browse files Browse the repository at this point in the history
…ent-go
  • Loading branch information
benma committed May 16, 2024
2 parents dd85a15 + 6fa84b9 commit 0d604ac
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 34 deletions.
4 changes: 2 additions & 2 deletions electrum/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"sync"
"time"

"github.com/digitalbitbox/block-client-go/electrum/types"
"github.com/digitalbitbox/block-client-go/jsonrpc"
"github.com/BitBoxSwiss/block-client-go/electrum/types"
"github.com/BitBoxSwiss/block-client-go/jsonrpc"
)

// supportedProtocolVersion reports to the servers the minimal supported electrum
Expand Down
6 changes: 3 additions & 3 deletions electrum/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"testing"
"time"

"github.com/digitalbitbox/block-client-go/electrum/types"
"github.com/digitalbitbox/block-client-go/jsonrpc/test"
jsonrpctypes "github.com/digitalbitbox/block-client-go/jsonrpc/types"
"github.com/BitBoxSwiss/block-client-go/electrum/types"
"github.com/BitBoxSwiss/block-client-go/jsonrpc/test"
jsonrpctypes "github.com/BitBoxSwiss/block-client-go/jsonrpc/types"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
)
Expand Down
8 changes: 4 additions & 4 deletions failover/failover_electrum_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"testing"
"time"

"github.com/digitalbitbox/block-client-go/electrum"
"github.com/digitalbitbox/block-client-go/electrum/types"
"github.com/digitalbitbox/block-client-go/jsonrpc/test"
jsonrpctypes "github.com/digitalbitbox/block-client-go/jsonrpc/types"
"github.com/BitBoxSwiss/block-client-go/electrum"
"github.com/BitBoxSwiss/block-client-go/electrum/types"
"github.com/BitBoxSwiss/block-client-go/jsonrpc/test"
jsonrpctypes "github.com/BitBoxSwiss/block-client-go/jsonrpc/types"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
)
Expand Down
10 changes: 2 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
module github.com/digitalbitbox/block-client-go
module github.com/BitBoxSwiss/block-client-go

go 1.19

require (
github.com/btcsuite/btcd v0.24.0
github.com/stretchr/testify v1.8.4
)
require github.com/stretchr/testify v1.8.4

require (
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
13 changes: 0 additions & 13 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
github.com/btcsuite/btcd v0.24.0 h1:gL3uHE/IaFj6fcZSu03SvqPMSx7s/dPzfpG/atRwWdo=
github.com/btcsuite/btcd v0.24.0/go.mod h1:K4IDc1593s8jKXIF7yS7yCTSxrknB9z0STzc2j6XgE4=
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand Down
2 changes: 1 addition & 1 deletion jsonrpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"sync"
"time"

"github.com/digitalbitbox/block-client-go/jsonrpc/types"
"github.com/BitBoxSwiss/block-client-go/jsonrpc/types"
)

const writeTimeout = 10 * time.Second
Expand Down
4 changes: 2 additions & 2 deletions jsonrpc/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"
"time"

"github.com/digitalbitbox/block-client-go/jsonrpc/test"
"github.com/digitalbitbox/block-client-go/jsonrpc/types"
"github.com/BitBoxSwiss/block-client-go/jsonrpc/test"
"github.com/BitBoxSwiss/block-client-go/jsonrpc/types"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
)
Expand Down
2 changes: 1 addition & 1 deletion jsonrpc/test/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"testing"
"time"

"github.com/digitalbitbox/block-client-go/jsonrpc/types"
"github.com/BitBoxSwiss/block-client-go/jsonrpc/types"
"github.com/stretchr/testify/require"
)

Expand Down

0 comments on commit 0d604ac

Please sign in to comment.