[FABG-843] update to golangci-lint v1.16.0

This change updates the linter tool version and resolves newly found linter errors. Change-Id: Ibf36d72d398e14b4bc150a309849409b86afc277 Signed-off-by: Troy Ronda <[email protected]>
hyperledger · Apr 3, 2019 · ca2a7a3 · ca2a7a3
1 parent 37a26c6
commit ca2a7a3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ FABRIC_SDKGO_TEST_CHANGED  ?= false
 FABRIC_SDKGO_TESTRUN_ID    ?= $(shell date +'%Y%m%d%H%M%S')
 
 # Dev tool versions (overridable)
-GOLANGCI_LINT_VER ?= v1.15.0
+GOLANGCI_LINT_VER ?= v1.16.0
 
 # Fabric tool versions (overridable)
 FABRIC_TOOLS_VERSION ?= $(FABRIC_STABLE_VERSION)

diff --git a/pkg/fab/events/mocks/mockdelserver.go b/pkg/fab/events/mocks/mockdelserver.go
@@ -119,7 +119,7 @@ func (s *MockDeliverServer) Deliver(srv pb.Deliver_DeliverServer) error {
 		if err1 != nil {
 			return err1
 		}
-		if err == io.EOF || envelope == nil {
+		if err == io.EOF {
 			test.Logf("*** mockdelserver err is io.EOF or envelope == nil, disconnecting from Deliver..")
 			disconnect <- true
 			break
@@ -162,7 +162,7 @@ func (s *MockDeliverServer) DeliverFiltered(srv pb.Deliver_DeliverFilteredServer
 		if err1 != nil {
 			return err1
 		}
-		if err == io.EOF || envelope == nil {
+		if err == io.EOF {
 			test.Logf("*** mockdelserver err is io.EOF or envelope == nil, disconnecting from DeliverFiltered..")
 			disconnect <- true
 			break

diff --git a/pkg/fab/keyvaluestore/filekeyvaluestore.go b/pkg/fab/keyvaluestore/filekeyvaluestore.go
@@ -138,17 +138,6 @@ func (fkvs *FileKeyValueStore) Store(key interface{}, value interface{}) error {
 	if err != nil {
 		return err
 	}
-	if value == nil {
-		_, err1 := os.Stat(file)
-		if err1 != nil {
-			if !os.IsNotExist(err1) {
-				return errors.Wrapf(err, "stat dir failed")
-			}
-			// Doesn't exist, OK
-			return nil
-		}
-		return os.Remove(file)
-	}
 	valueBytes, err := fkvs.marshaller(value)
 	if err != nil {
 		return err

diff --git a/pkg/fab/mocks/mockbroadcastserver.go b/pkg/fab/mocks/mockbroadcastserver.go
@@ -93,7 +93,7 @@ func (m *MockBroadcastServer) mockBlockDelivery(payload []byte) error {
 		return err
 	}
 	// if payload is empty, then no need to broadcast to block DeliveryServer
-	if pl == nil || pl.Header == nil {
+	if pl.Header == nil {
 		return nil
 	}
 	chdr := &common.ChannelHeader{}