refactor

.golangci.yml

@@ -17,11 +17,13 @@ linters:
     - misspell
     - unconvert
     - typecheck
+    - errcheck
     #    - unused
     - staticcheck
     - bidichk
     - durationcheck
-    - exportloopref
+    - goconst
+    - noctx
     - whitespace
     - revive # only certain checks enabled
 

blockchain/orginzationMetadata.go

@@ -127,7 +127,7 @@ func checkMandatoryFields(metaData *OrganizationMetaData) (err error) {
 	}
 
 	if metaData.recipientPaymentAddress == (common.Address{}) {
-		err = fmt.Errorf("Mandatory field : Recepient Address is missing for the Group %v ", metaData.daemonGroup.GroupName)
+		err = fmt.Errorf("Mandatory field : Recipient Address is missing for the Group %v ", metaData.daemonGroup.GroupName)
 	}
 	return err
 }

config/blockchain_network_config.go

@@ -116,7 +116,7 @@ func deriveDatafromJSON(data []byte) (err error) {
 	networkSelected.RegistryAddressKey = fmt.Sprintf("%v", m[GetNetworkId()].(map[string]any)["address"])
 
 	zap.L().Info("Derive data from JSON", zap.String("Network", GetString(BlockChainNetworkSelected)),
-		zap.String("Netwrok id", GetNetworkId()),
+		zap.String("Network id", GetNetworkId()),
 		zap.String("Registry address", GetRegistryAddress()),
 		zap.String("Blockchain http endpoint", GetBlockChainHTTPEndPoint()),
 		zap.String("Blockchain ws endpoint", GetBlockChainWSEndPoint()),

etcddb/etcddb_client.go

@@ -107,7 +107,7 @@ func Reconnect(metadata *blockchain.OrganizationMetaData) (*EtcdClient, error) {
 	if err != nil {
 		return nil, err
 	}
-	zap.L().Info("Successful reconnet to new etcd endpoints", zap.Strings("New endpoints", metadata.GetPaymentStorageEndPoints()))
+	zap.L().Info("Successful reconnect to new etcd endpoints", zap.Strings("New endpoints", metadata.GetPaymentStorageEndPoints()))
 	return etcdClient, nil
 }
 

handler/grpc.go

@@ -130,6 +130,7 @@ func (g grpcHandler) grpcToGRPC(srv any, inStream grpc.ServerStream) error {
 	}
 
 	outCtx, outCancel := context.WithCancel(inCtx)
+	defer outCancel()
 	outCtx = metadata.NewOutgoingContext(outCtx, md.Copy())
 	isModelTraining := g.serviceMetaData.IsModelTraining(method)
 	outStream, err := g.GrpcConn(isModelTraining).NewStream(outCtx, grpcDesc, method, grpc.CallContentSubtype(g.enc))

metrics/utils.go

@@ -177,6 +177,7 @@ func getTokenFromResponse(response *http.Response) (string, bool) {
 		zap.L().Warn("Empty response received.")
 		return "", false
 	}
+	defer response.Body.Close()
 	if response.StatusCode != http.StatusOK {
 		zap.L().Warn("Service call failed", zap.Int("StatusCode", response.StatusCode))
 		return "", false
@@ -187,9 +188,12 @@ func getTokenFromResponse(response *http.Response) (string, bool) {
 		return "", false
 	}
 	var data TokenGenerated
-	json.Unmarshal(body, &data)
+	err = json.Unmarshal(body, &data)
+	if err != nil {
+		zap.L().Error("Can't unmarshal TokenGenerated", zap.Error(err))
+		return "", false
+	}
 	//close the body
-	defer response.Body.Close()
 	return data.Data.Token, true
 }