deliverservice: update DialerAdapter signature

Signed-off-by: Matthew Sykes <[email protected]>

core/deliverservice/deliveryclient.go

@@ -8,7 +8,6 @@ package deliverservice
 
 import (
 	"context"
-	"crypto/x509"
 	"errors"
 	"fmt"
 	"sync"
@@ -88,13 +87,14 @@ type DialerAdapter struct {
 	ClientConfig comm.ClientConfig
 }
 
-func (da DialerAdapter) Dial(address string, certPool *x509.CertPool) (*grpc.ClientConn, error) {
+func (da DialerAdapter) Dial(address string, rootCerts [][]byte) (*grpc.ClientConn, error) {
 	cc := da.ClientConfig
+	cc.SecOpts.ServerRootCAs = rootCerts
 	client, err := comm.NewGRPCClient(cc)
 	if err != nil {
 		return nil, err
 	}
-	return client.NewConnection(address, comm.CertPoolOverride(certPool))
+	return client.NewConnection(address)
 }
 
 type DeliverAdapter struct{}

internal/pkg/peer/blocksprovider/blocksprovider.go

@@ -8,7 +8,6 @@ package blocksprovider
 
 import (
 	"context"
-	"crypto/x509"
 	"math"
 	"time"
 
@@ -17,7 +16,6 @@ import (
 	"github.com/hyperledger/fabric-protos-go/orderer"
 	"github.com/hyperledger/fabric/common/flogging"
 	gossipcommon "github.com/hyperledger/fabric/gossip/common"
-	"github.com/hyperledger/fabric/internal/pkg/comm"
 	"github.com/hyperledger/fabric/internal/pkg/identity"
 	"github.com/hyperledger/fabric/internal/pkg/peer/orderers"
 	"github.com/hyperledger/fabric/protoutil"
@@ -75,7 +73,7 @@ type OrdererConnectionSource interface {
 
 //go:generate counterfeiter -o fake/dialer.go --fake-name Dialer . Dialer
 type Dialer interface {
-	Dial(address string, certPool *x509.CertPool) (*grpc.ClientConn, error)
+	Dial(address string, rootCerts [][]byte) (*grpc.ClientConn, error)
 }
 
 //go:generate counterfeiter -o fake/deliver_streamer.go --fake-name DeliverStreamer . DeliverStreamer
@@ -285,14 +283,7 @@ func (d *Deliverer) connect(seekInfoEnv *common.Envelope) (orderer.AtomicBroadca
 		return nil, nil, nil, errors.WithMessage(err, "could not get orderer endpoints")
 	}
 
-	certPool := x509.NewCertPool()
-	for _, cert := range endpoint.RootCerts {
-		if err := comm.AddPemToCertPool(cert, certPool); err != nil {
-			return nil, nil, nil, err
-		}
-	}
-
-	conn, err := d.Dialer.Dial(endpoint.Address, certPool)
+	conn, err := d.Dialer.Dial(endpoint.Address, endpoint.RootCerts)
 	if err != nil {
 		return nil, nil, nil, errors.WithMessagef(err, "could not dial endpoint '%s'", endpoint.Address)
 	}

internal/pkg/peer/blocksprovider/blocksprovider_test.go

@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
 package blocksprovider_test
 
 import (
-	"crypto/x509"
 	"fmt"
 	"sync"
 	"time"
@@ -59,7 +58,7 @@ var _ = Describe("Blocksprovider", func() {
 
 		fakeDialer = &fake.Dialer{}
 		ccs = nil
-		fakeDialer.DialStub = func(string, *x509.CertPool) (*grpc.ClientConn, error) {
+		fakeDialer.DialStub = func(string, [][]byte) (*grpc.ClientConn, error) {
 			mutex.Lock()
 			defer mutex.Unlock()
 			cc, err := grpc.Dial("", grpc.WithInsecure())
@@ -216,7 +215,7 @@ var _ = Describe("Blocksprovider", func() {
 		Eventually(fakeDialer.DialCallCount).Should(Equal(1))
 		addr, tlsCerts := fakeDialer.DialArgsForCall(0)
 		Expect(addr).To(Equal("orderer-address"))
-		Expect(tlsCerts).NotTo(BeNil()) // TODO
+		Expect(tlsCerts).To(BeNil()) // TODO
 	})
 
 	When("the dialer returns an error", func() {