Skip to content

Commit

Permalink
[FABG-713] fix: remove duplicated line and a typo
Browse files Browse the repository at this point in the history
Change-Id: I65cc80253816d0fff6e6be0d9f6d14a414dc93dc
Signed-off-by: ping40 <norberthu30@gmail.com>
  • Loading branch information
ping40 committed Aug 11, 2018
1 parent 708bb63 commit 6c18d00
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 0 additions & 1 deletion pkg/core/config/comm/tls/certpool.go
Expand Up @@ -9,7 +9,6 @@ package tls
import (
"crypto/x509"
"sync"

"sync/atomic"

"github.com/hyperledger/fabric-sdk-go/pkg/common/logging"
Expand Down
7 changes: 3 additions & 4 deletions pkg/core/config/comm/tls/certpool_test.go
Expand Up @@ -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{
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/fab/chconfig/chconfig.go
Expand Up @@ -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"
Expand All @@ -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")
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 6c18d00

Please sign in to comment.