Fix cyclo and misspell linters

Signed-off-by: Antoine Chabert <antoine.chabert@tohero.fr>

Author: antitoine

.gometalinter.json

@@ -14,6 +14,8 @@
     "unconvert",
     "varcheck",
     "vet",
-    "vetshadow"
+    "vetshadow",
+    "misspell",
+    "gocyclo"
   ]
 }

Makefile

@@ -54,7 +54,7 @@ test:
 
 lint:
 	@echo "Lint..."
-	@gometalinter --vendor --deadline=8m --exclude=app/vendor --exclude=chaincode/vendor ./...
+	@gometalinter --vendor --deadline=8m --exclude=app/vendor --exclude=chaincode/vendor --cyclo-over=15 ./...
 	@echo "Lint done"
 
 ##### CLEAN

app/fabric/setup.go

@@ -80,7 +80,7 @@ func (s *Setup) Initialize() error {
 
 // Install reads the configuration stored in the Setup struct and sets up the blockchain channel and chaincode
 func (s *Setup) Install() error {
-	fmt.Printf("Preparing contextes to create channel...\n")
+	fmt.Printf("Preparing contexts to create channel...\n")
 
 	//clientContext allows creation of transactions using the supplied identity as the credential.
 	clientContext := s.sdk.Context(fabsdk.WithUser(s.OrgAdminUser), fabsdk.WithOrg(s.OrdererOrgID))
@@ -98,7 +98,7 @@ func (s *Setup) Install() error {
 		return fmt.Errorf("unable to create the channel: %v", err)
 	}
 
-	fmt.Printf("Preparing contextes to make peers joinning the new channel...\n")
+	fmt.Printf("Preparing contexts to make peers joinning the new channel...\n")
 
 	// Prepare context
 	adminContext := s.sdk.Context(fabsdk.WithUser(s.OrgAdminUser), fabsdk.WithOrg(s.OrgID))

chaincode/query.go

@@ -147,17 +147,9 @@ func (t *ResourceManagerChaincode) resources(stub shim.ChaincodeStubInterface, a
 		if err != nil {
 			return shim.Error(fmt.Sprintf("Unable to convert a resource: %v", err))
 		}
-		// If the request owner is a consumer, we give only available resources or its  previously acquired
-		if model.ActorConsumer == actorType && !resource.Available && resource.Consumer != actorID {
-			continue
+		if isResourceCanBeReturned(actorID, actorType, filter, &resource) {
+			resources = append(resources, resource)
 		}
-		if filter == model.ResourcesFilterOnlyAvailable && !resource.Available {
-			continue
-		}
-		if filter == model.ResourcesFilterOnlyUnavailable && resource.Available {
-			continue
-		}
-		resources = append(resources, resource)
 	}
 
 	resourcesAsByte, err := objectToByte(resources)
@@ -168,6 +160,21 @@ func (t *ResourceManagerChaincode) resources(stub shim.ChaincodeStubInterface, a
 	return shim.Success(resourcesAsByte)
 }
 
+// isResourceCanBeReturned check if the resource can be return to the given actor and filter given.
+func isResourceCanBeReturned(actorID string, actorType string, filter string, resource *model.Resource) bool {
+	// If the request owner is a consumer, we give only available resources or its  previously acquired
+	if model.ActorConsumer == actorType && !resource.Available && resource.Consumer != actorID {
+		return false
+	}
+	if filter == model.ResourcesFilterOnlyAvailable && !resource.Available {
+		return false
+	}
+	if filter == model.ResourcesFilterOnlyUnavailable && resource.Available {
+		return false
+	}
+	return true
+}
+
 func (t *ResourceManagerChaincode) resourcesDeleted(stub shim.ChaincodeStubInterface, args []string) pb.Response {
 
 	fmt.Println("# resources deleted list")