From f1f53d1893ad65421be18c3c03635742cf0a99cb Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 15 Mar 2022 18:00:11 -0700 Subject: [PATCH] build: add temporary replace directives for btcec+chainhash This PR includes some changes to them, so we'll need to use a temporary replace directives to ensure the build passes. --- btcutil/go.mod | 4 ++++ btcutil/go.sum | 5 ----- go.mod | 4 ++++ go.sum | 2 -- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/btcutil/go.mod b/btcutil/go.mod index ba110830fa5..9b3cc2afad4 100644 --- a/btcutil/go.mod +++ b/btcutil/go.mod @@ -14,3 +14,7 @@ require ( ) replace github.com/btcsuite/btcd => ../ + +replace github.com/btcsuite/btcd/chaincfg/chainhash => ../chaincfg/chainhash + +replace github.com/btcsuite/btcd/btcec/v2 => ../btcec diff --git a/btcutil/go.sum b/btcutil/go.sum index 8617dd83513..6958d531e23 100644 --- a/btcutil/go.sum +++ b/btcutil/go.sum @@ -1,11 +1,6 @@ github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= -github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA= -github.com/btcsuite/btcd/btcec/v2 v2.1.1 h1:xxivBG6pU3wwxx9qPNZP+2K0PXO9VmFLaSrwOFr24Hw= -github.com/btcsuite/btcd/btcec/v2 v2.1.1/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0 h1:MSskdM4/xJYcFzy0altH/C/xHopifpWzHUi1JeVI34Q= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= 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/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= diff --git a/go.mod b/go.mod index 732ed420c88..f5295d3abbc 100644 --- a/go.mod +++ b/go.mod @@ -29,6 +29,10 @@ require ( replace github.com/btcsuite/btcd/btcutil => ./btcutil +replace github.com/btcsuite/btcd/chaincfg/chainhash => ./chaincfg/chainhash + +replace github.com/btcsuite/btcd/btcec/v2 => ./btcec + // The retract statements below fixes an accidental push of the tags of a btcd // fork. retract ( diff --git a/go.sum b/go.sum index 604e50543ee..2dc38639a8e 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,6 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBA github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M= github.com/btcsuite/btcd/btcec/v2 v2.1.1 h1:xxivBG6pU3wwxx9qPNZP+2K0PXO9VmFLaSrwOFr24Hw= github.com/btcsuite/btcd/btcec/v2 v2.1.1/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0 h1:MSskdM4/xJYcFzy0altH/C/xHopifpWzHUi1JeVI34Q= -github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= 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/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=