multi: bump btcec/v2 and btcutil to new versions

This commit is contained in:
positiveblue
2022-03-10 17:09:26 -08:00
committed by Oliver Gugger
parent 7a8449f1bd
commit 2c3cb8c9f7
13 changed files with 360 additions and 178 deletions

View File

@@ -35,6 +35,11 @@ const (
testPathRegexpGRPC = "^/proxy_test\\.Greeter/.*$"
testTargetServiceAddress = "localhost:8082"
testHTTPResponseBody = "HTTP Hello"
// DefaultAutogenValidity is the default validity of a self-signed
// certificate. The value corresponds to 14 months
// (14 months * 30 days * 24 hours).
DefaultAutogenValidity = 14 * 30 * 24 * time.Hour
)
var (
@@ -339,11 +344,12 @@ func runGRPCTest(t *testing.T, tc *testCase) {
[]byte("key"), []byte("id"), "loc", macaroon.LatestVersion,
)
require.NoError(t, err)
cred, err := macaroons.NewMacaroonCredential(dummyMac)
require.NoError(t, err)
opts = []grpc.DialOption{
grpc.WithTransportCredentials(creds),
grpc.WithPerRPCCredentials(macaroons.NewMacaroonCredential(
dummyMac,
)),
grpc.WithPerRPCCredentials(cred),
}
conn, err = grpc.Dial(testProxyAddr, opts...)
require.NoError(t, err)
@@ -402,7 +408,7 @@ func genCertPair(certFile, keyFile string) (*x509.CertPool,
crt := tls.Certificate{}
err := cert.GenCertPair(
"aperture autogenerated cert", certFile, keyFile, nil, nil,
false, cert.DefaultAutogenValidity,
false, DefaultAutogenValidity,
)
if err != nil {
return nil, nil, crt, fmt.Errorf("unable to generate cert "+