[FABG-713] fix: remove duplicated line and a typo

Change-Id: I65cc80253816d0fff6e6be0d9f6d14a414dc93dc Signed-off-by: ping40 <[email protected]>
hyperledger · Aug 11, 2018 · 6c18d00 · 6c18d00
1 parent 708bb63
commit 6c18d00
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/pkg/core/config/comm/tls/certpool.go b/pkg/core/config/comm/tls/certpool.go
@@ -9,7 +9,6 @@ package tls
 import (
 	"crypto/x509"
 	"sync"
-
 	"sync/atomic"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/common/logging"

diff --git a/pkg/core/config/comm/tls/certpool_test.go b/pkg/core/config/comm/tls/certpool_test.go
@@ -8,16 +8,16 @@ package tls
 
 import (
 	"crypto/x509"
+	"encoding/pem"
 	"errors"
 	"strconv"
 	"testing"
 	"time"
 
-	"encoding/pem"
-
-	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
 )
 
 var goodCert = &x509.Certificate{
@@ -154,7 +154,6 @@ func verifyCertPoolInstance(t *testing.T, pool *x509.CertPool, fabPool fab.CertP
 	assert.Equal(t, numberOfCerts, len(tlsCertPool.certs))
 	assert.Equal(t, numberOfCertsByName, len(tlsCertPool.certsByName))
 	assert.Equal(t, numberOfSubjects+numberOfCertsInPool, len(pool.Subjects()))
-	assert.Equal(t, numberOfSubjects+numberOfCertsInPool, len(pool.Subjects()))
 }
 
 func TestAddingDuplicateCertsToPool(t *testing.T) {

diff --git a/pkg/fab/chconfig/chconfig.go b/pkg/fab/chconfig/chconfig.go
@@ -12,6 +12,7 @@ import (
 	"regexp"
 
 	"github.com/golang/protobuf/proto"
+	"github.com/pkg/errors"
 
 	channelConfig "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/channelconfig"
 	imsp "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/msp"
@@ -26,7 +27,6 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
 	mb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/msp"
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
-	"github.com/pkg/errors"
 )
 
 var logger = logging.NewLogger("fabsdk/fab")
@@ -345,7 +345,7 @@ func WithRetryOpts(retryOpts retry.Opts) Option {
 	}
 }
 
-// prepareQueryConfigOpts Reads channel config options from Option array
+// prepareOpts Reads channel config options from Option array
 func prepareOpts(options ...Option) (Opts, error) {
 	opts := Opts{}
 	for _, option := range options {