[FAB-9312] Resolve metalinter warnings

- fix fab pkg Change-Id: I1a9bbb398b8e9712cd9b1e715477d7506b04461c Signed-off-by: Firas Qutishat <[email protected]>
hyperledger · Apr 10, 2018 · 03bf99b · 03bf99b
1 parent 3a2cb7c
commit 03bf99b
Show file tree

Hide file tree

Showing 15 changed files with 304 additions and 279 deletions.
diff --git a/pkg/fab/ccpackager/gopackager/packager.go b/pkg/fab/ccpackager/gopackager/packager.go
@@ -21,6 +21,8 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/pkg/fab/resource/api"
 	"github.com/pkg/errors"
 
+	"fmt"
+
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 )
 
@@ -101,10 +103,8 @@ func findSource(goPath string, filePath string) ([]*Descriptor, error) {
 			return nil
 
 		})
-	if err != nil {
-		return descriptors, err
-	}
-	return descriptors, nil
+
+	return descriptors, err
 }
 
 // -------------------------------------------------------------------------
@@ -138,26 +138,42 @@ func generateTarGz(descriptors []*Descriptor) ([]byte, error) {
 		logger.Debugf("generateTarGz for %s", v.fqp)
 		err := packEntry(tw, gw, v)
 		if err != nil {
-			closeStream(tw, gw)
+			err1 := closeStream(tw, gw)
+			if err1 != nil {
+				return nil, errors.Wrap(err, fmt.Sprintf("packEntry failed and close error %v", err1))
+			}
 			return nil, errors.Wrap(err, "packEntry failed")
 		}
 	}
-	closeStream(tw, gw)
+	err := closeStream(tw, gw)
+	if err != nil {
+		return nil, errors.Wrap(err, "closeStream failed")
+	}
 	return codePackage.Bytes(), nil
 
 }
 
-func closeStream(tw *tar.Writer, gw *gzip.Writer) {
-	tw.Close()
-	gw.Close()
+func closeStream(tw io.Closer, gw io.Closer) error {
+	err := tw.Close()
+	if err != nil {
+		return err
+	}
+	err = gw.Close()
+	return err
 }
 
 func packEntry(tw *tar.Writer, gw *gzip.Writer, descriptor *Descriptor) error {
 	file, err := os.Open(descriptor.fqp)
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+	defer func() {
+		err := file.Close()
+		if err != nil {
+			logger.Warnf("error file close %v", err)
+		}
+	}()
+
 	if stat, err := file.Stat(); err == nil {
 
 		// now lets create the header as needed for this file within the tarball
@@ -179,8 +195,12 @@ func packEntry(tw *tar.Writer, gw *gzip.Writer, descriptor *Descriptor) error {
 		if _, err := io.Copy(tw, file); err != nil {
 			return err
 		}
-		tw.Flush()
-		gw.Flush()
+		if err := tw.Flush(); err != nil {
+			return err
+		}
+		if err := gw.Flush(); err != nil {
+			return err
+		}
 
 	}
 	return nil

diff --git a/pkg/fab/channel/ledger.go b/pkg/fab/channel/ledger.go
@@ -228,15 +228,6 @@ func (c *Ledger) QueryConfigBlock(reqCtx reqContext.Context, targets []fab.Propo
 	return createCommonBlock(tprs[0])
 }
 
-func collectProposalResponses(tprs []*fab.TransactionProposalResponse) [][]byte {
-	responses := [][]byte{}
-	for _, tpr := range tprs {
-		responses = append(responses, tpr.ProposalResponse.GetResponse().Payload)
-	}
-
-	return responses
-}
-
 func queryChaincode(reqCtx reqContext.Context, channelID string, request fab.ChaincodeInvokeRequest, targets []fab.ProposalProcessor, verifier ResponseVerifier) ([]*fab.TransactionProposalResponse, error) {
 	ctx, ok := contextImpl.RequestClientContext(reqCtx)
 	if !ok {

diff --git a/pkg/fab/channel/ledger_test.go b/pkg/fab/channel/ledger_test.go
@@ -6,11 +6,11 @@ SPDX-License-Identifier: Apache-2.0
 package channel
 
 import (
+	reqContext "context"
 	"errors"
 	"fmt"
 	"strings"
 	"testing"
-
 	"time"
 
 	"github.com/golang/protobuf/proto"
@@ -175,13 +175,13 @@ func TestQueryConfig(t *testing.T) {
 	peer := mocks.MockPeer{MockName: "Peer1", MockURL: "http://peer1.com", MockRoles: []string{}, MockCert: nil, Payload: payload, Status: 200}
 
 	// fail with min endorsers
-	res, err := channel.QueryConfigBlock(reqCtx, []fab.ProposalProcessor{&peer}, &TransactionProposalResponseVerifier{MinResponses: 2})
+	_, err = channel.QueryConfigBlock(reqCtx, []fab.ProposalProcessor{&peer}, &TransactionProposalResponseVerifier{MinResponses: 2})
 	if err == nil {
 		t.Fatalf("Should have failed with since there's one endorser and at least two are required")
 	}
 
 	// success with one endorser
-	res, err = channel.QueryConfigBlock(reqCtx, []fab.ProposalProcessor{&peer}, &TransactionProposalResponseVerifier{MinResponses: 1})
+	res, err := channel.QueryConfigBlock(reqCtx, []fab.ProposalProcessor{&peer}, &TransactionProposalResponseVerifier{MinResponses: 1})
 	if err != nil || res == nil {
 		t.Fatalf("Test QueryConfig failed: %v", err)
 	}
@@ -196,6 +196,11 @@ func TestQueryConfig(t *testing.T) {
 	}
 
 	// Create different config block payload
+	createDifferentConfigBlockPayload(t, peer2, channel, reqCtx, peer)
+
+}
+
+func createDifferentConfigBlockPayload(t *testing.T, peer2 mocks.MockPeer, channel *Ledger, reqCtx reqContext.Context, peer mocks.MockPeer) {
 	builder2 := &mocks.MockConfigBlockBuilder{
 		MockConfigGroupBuilder: mocks.MockConfigGroupBuilder{
 			ModPolicy: "Admins",
@@ -208,19 +213,16 @@ func TestQueryConfig(t *testing.T) {
 		Index:           0,
 		LastConfigIndex: 0,
 	}
-
 	payload2, err := proto.Marshal(builder2.Build())
 	if err != nil {
 		t.Fatalf("Failed to marshal mock block 2")
 	}
-
 	// peer 2 now had different payload; query config block should fail
 	peer2.Payload = payload2
-	res, err = channel.QueryConfigBlock(reqCtx, []fab.ProposalProcessor{&peer, &peer2}, &TransactionProposalResponseVerifier{MinResponses: 2})
+	_, err = channel.QueryConfigBlock(reqCtx, []fab.ProposalProcessor{&peer, &peer2}, &TransactionProposalResponseVerifier{MinResponses: 2})
 	if err == nil {
 		t.Fatalf("Should have failed for different block payloads")
 	}
-
 }
 
 func TestQueryConfigBlockDifferentMetadata(t *testing.T) {

diff --git a/pkg/fab/channel/membership/membership.go b/pkg/fab/channel/membership/membership.go
@@ -145,11 +145,9 @@ func loadMSPs(mspConfigs []*mb.MSPConfig, cs core.CryptoSuite) ([]msp.MSP, error
 		}
 
 		// get the application org names
-		var orgs []string
 		orgUnits := fabricConfig.OrganizationalUnitIdentifiers
 		for _, orgUnit := range orgUnits {
 			logger.Debugf("loadMSPs - found org of :: %s", orgUnit.OrganizationalUnitIdentifier)
-			orgs = append(orgs, orgUnit.OrganizationalUnitIdentifier)
 		}
 
 		// TODO: Do something with orgs
@@ -193,7 +191,10 @@ func addCertsToConfig(config fab.EndpointConfig, pemCerts []byte) {
 		if err != nil {
 			logger.Warn("%v", err)
 		}
-		config.TLSCACertPool(cert)
+		_, err = config.TLSCACertPool(cert)
+		if err != nil {
+			logger.Warnf("TLSCACertPool failed %v", err)
+		}
 
 	}
 }
diff --git a/pkg/fab/channel/membership/membership_test.go b/pkg/fab/channel/membership/membership_test.go
@@ -276,20 +276,6 @@ Vnsqn32+nmoGO6dn1CvwtUTBMAoGCCqGSM49BAMCA0gAMEUCIQCH8+Vw0L38dv/v
 5fDo4hNhETQ=
 -----END CERTIFICATE-----`
 
-var expiredCertificate = `-----BEGIN CERTIFICATE-----
-MIIB/TCCAaOgAwIBAgIBATAKBggqhkjOPQQDAjBOMRMwEQYDVQQKDArOoyBBY21l
-IENvMRkwFwYDVQQDExB0ZXN0LmV4YW1wbGUuY29tMQ8wDQYDVQQqEwZHb3BoZXIx
-CzAJBgNVBAYTAk5MMB4XDTE4MDMyMDE5NDE0NVoXDTE4MDMyMDIxNDE0NVowTjET
-MBEGA1UECgwKzqMgQWNtZSBDbzEZMBcGA1UEAxMQdGVzdC5leGFtcGxlLmNvbTEP
-MA0GA1UEKhMGR29waGVyMQswCQYDVQQGEwJOTDBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABKuBweTX12BpJ4zbhYflCWUnEAWLmOsPohPOF38Bf2efHET0+MjD3fqR
-FAXOxTxeDXCRJOrEavnimpFUZCAOxvCjcjBwMA4GA1UdDwEB/wQEAwICBDAmBgNV
-HSUEHzAdBggrBgEFBQcDAgYIKwYBBQUHAwEGAioDBgOBCwEwDwYDVR0TAQH/BAUw
-AwEB/zANBgNVHQ4EBgQEAQIDBDAWBgMqAwQED2V4dHJhIGV4dGVuc2lvbjAKBggq
-hkjOPQQDAgNIADBFAiA9WgC9FDstiVmU6JreuN9AKGDhOjuC069A5A5K9fNLEwIh
-AJ4v8ZQD4r2oPaiJtxJOPLx4OYGEPDUWmhdj3MkWUBZd
------END CERTIFICATE-----`
-
 type validity struct {
 	NotBefore, NotAfter time.Time
 }

diff --git a/pkg/fab/chconfig/cache.go b/pkg/fab/chconfig/cache.go
@@ -43,7 +43,10 @@ func NewCacheKey(ctx fab.ClientContext, pvdr Provider, channelID string) (CacheK
 	}
 
 	h := sha256.New()
-	h.Write(identity)
+	_, err = h.Write(identity)
+	if err != nil {
+		return nil, err
+	}
 	hash := h.Sum([]byte(channelID))
 
 	return &cacheKey{