Skip to content

Commit

Permalink
mod: update btcd to work around ambiguous import
Browse files Browse the repository at this point in the history
Update btcd from v0.22.0-beta to v0.22.1 per the instructions on
btcsuite/btcd#1839 to work around an ambiguous
import via go-ethereum:

	github.com/vocdoni/blind-csp/saltedkey imports
		github.com/ethereum/go-ethereum/crypto imports
		github.com/btcsuite/btcd/btcec/v2/ecdsa tested by
		github.com/btcsuite/btcd/btcec/v2/ecdsa.test imports
		github.com/btcsuite/btcd/chaincfg/chainhash: ambiguous import: found package github.com/btcsuite/btcd/chaincfg/chainhash in multiple modules:
		github.com/btcsuite/btcd v0.22.0-beta (/home/mvdan/go/pkg/mod/github.com/btcsuite/btcd@v0.22.0-beta/chaincfg/chainhash)
		github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 (/home/mvdan/go/pkg/mod/github.com/btcsuite/btcd/chaincfg/chainhash@v1.0.1)
  • Loading branch information
mvdan authored and p4u committed Jul 18, 2022
1 parent 91707ec commit 814d262
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 93 deletions.
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.15

require (
github.com/DataDog/zstd v1.5.2 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/arnaucube/go-blindsecp256k1 v0.0.0-20220421060538-07077d895da5
github.com/btcsuite/btcd v0.22.1 // indirect
github.com/cockroachdb/errors v1.9.0 // indirect
github.com/cockroachdb/pebble v0.0.0-20220708173837-d3484a60444e // indirect
github.com/containerd/containerd v1.6.6 // indirect
Expand All @@ -32,7 +32,6 @@ require (
github.com/spf13/viper v1.12.0
github.com/strikesecurity/strikememongo v0.2.4 // direct
github.com/subosito/gotenv v1.4.0 // indirect
github.com/tendermint/tendermint v0.34.15 // indirect
github.com/twilio/twilio-go v0.26.0
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
go.mongodb.org/mongo-driver v1.10.0
Expand All @@ -43,6 +42,5 @@ require (
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
google.golang.org/grpc v1.46.2 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
)
Loading

0 comments on commit 814d262

Please sign in to comment.