Correct errors (#78)

* Specify bad request error

* Use Internal when possible

* Clean leftover in utils

* Fix after reviews

* BadRequest for DAG

Author: thibaultrobert

chaincode/algo_aggregate_test.go

@@ -51,7 +51,7 @@ func TestAggregateAlgo(t *testing.T) {
 	resp = mockStub.MockInvoke("42", args)
 	assert.EqualValuesf(t, 200, resp.Status, "when querying an aggregate algo with status %d and message %s", resp.Status, resp.Message)
 	algo := outputAggregateAlgo{}
-	err = bytesToStruct(resp.Payload, &algo)
+	err = json.Unmarshal(resp.Payload, &algo)
 	assert.NoError(t, err, "when unmarshalling queried aggregate  algo")
 	expectedAlgo := outputAggregateAlgo{
 		outputAlgo: outputAlgo{

chaincode/algo_composite_test.go

@@ -51,7 +51,7 @@ func TestCompositeAlgo(t *testing.T) {
 	resp = mockStub.MockInvoke("42", args)
 	assert.EqualValuesf(t, 200, resp.Status, "when querying a composite algo with status %d and message %s", resp.Status, resp.Message)
 	algo := outputCompositeAlgo{}
-	err = bytesToStruct(resp.Payload, &algo)
+	err = json.Unmarshal(resp.Payload, &algo)
 	assert.NoError(t, err, "when unmarshalling queried composite algo")
 	expectedAlgo := outputCompositeAlgo{
 		outputAlgo: outputAlgo{

chaincode/algo_test.go

@@ -49,7 +49,7 @@ func TestAlgo(t *testing.T) {
 	resp = mockStub.MockInvoke("42", args)
 	assert.EqualValuesf(t, 200, resp.Status, "when querying an algo with status %d and message %s", resp.Status, resp.Message)
 	algo := outputAlgo{}
-	err = bytesToStruct(resp.Payload, &algo)
+	err = json.Unmarshal(resp.Payload, &algo)
 	assert.NoError(t, err, "when unmarshalling queried objective")
 	expectedAlgo := outputAlgo{
 		Key:  algoKey,

chaincode/common.go

@@ -15,7 +15,7 @@
 package main
 
 import (
-	"fmt"
+	"chaincode/errors"
 	"strings"
 )
 
@@ -39,7 +39,7 @@ func queryFilter(db *LedgerDB, args []string) (elements interface{}, err error)
 		"aggregatetuple~tag",
 	}
 	if !stringInSlice(inp.IndexName, validIndexNames) {
-		err = fmt.Errorf("invalid indexName filter query: %s", inp.IndexName)
+		err = errors.BadRequest("invalid indexName filter query: %s", inp.IndexName)
 		return
 	}
 	indexName := inp.IndexName + "~key"

chaincode/compute_plan.go

@@ -16,7 +16,6 @@ package main
 
 import (
 	"chaincode/errors"
-	"fmt"
 	"strconv"
 )
 
@@ -31,7 +30,7 @@ func (inpTraintuple *inputTraintuple) Fill(inpCP inputComputePlanTraintuple, tra
 	for _, InModelID := range inpCP.InModelsIDs {
 		inModelKey, ok := traintupleKeysByID[InModelID]
 		if !ok {
-			return fmt.Errorf("model ID %s not found", InModelID)
+			return errors.BadRequest("model ID %s not found", InModelID)
 		}
 		inpTraintuple.InModels = append(inpTraintuple.InModels, inModelKey)
 	}
@@ -49,7 +48,7 @@ func (inpAggregatetuple *inputAggregatetuple) Fill(inpCP inputComputePlanAggrega
 	for _, InModelID := range inpCP.InModelsIDs {
 		inModelKey, ok := aggregatetupleKeysByID[InModelID]
 		if !ok {
-			return fmt.Errorf("model ID %s not found", InModelID)
+			return errors.BadRequest("model ID %s not found", InModelID)
 		}
 		inpAggregatetuple.InModels = append(inpAggregatetuple.InModels, inModelKey)
 	}
@@ -70,14 +69,14 @@ func (inpCompositeTraintuple *inputCompositeTraintuple) Fill(inpCP inputComputeP
 		var ok bool
 		inpCompositeTraintuple.InHeadModelKey, ok = traintupleKeysByID[inpCP.InHeadModelID]
 		if !ok {
-			return fmt.Errorf("head model ID %s not found", inpCP.InHeadModelID)
+			return errors.BadRequest("head model ID %s not found", inpCP.InHeadModelID)
 		}
 	}
 	if inpCP.InTrunkModelID != "" {
 		var ok bool
 		inpCompositeTraintuple.InTrunkModelKey, ok = traintupleKeysByID[inpCP.InTrunkModelID]
 		if !ok {
-			return fmt.Errorf("trunk model ID %s not found", inpCP.InTrunkModelID)
+			return errors.BadRequest("trunk model ID %s not found", inpCP.InTrunkModelID)
 		}
 	}
 	return nil
@@ -86,7 +85,7 @@ func (inpCompositeTraintuple *inputCompositeTraintuple) Fill(inpCP inputComputeP
 func (inpTesttuple *inputTesttuple) Fill(inpCP inputComputePlanTesttuple, traintupleKeysByID map[string]string) error {
 	traintupleKey, ok := traintupleKeysByID[inpCP.TraintupleID]
 	if !ok {
-		return fmt.Errorf("traintuple ID %s not found", inpCP.TraintupleID)
+		return errors.BadRequest("traintuple ID %s not found", inpCP.TraintupleID)
 	}
 	inpTesttuple.TraintupleKey = traintupleKey
 	inpTesttuple.DataManagerKey = inpCP.DataManagerKey

chaincode/compute_plan_dag.go

@@ -1,6 +1,6 @@
 package main
 
-import "fmt"
+import "chaincode/errors"
 
 // TrainingTask is a node of a ComputeDAG. It represents a training task
 // (i.e. a Traintuple, a CompositeTraintuple or an Aggregatetuple)
@@ -75,7 +75,7 @@ func (dag *ComputeDAG) sort() error {
 			current[i].Depth = depth
 			final = append(final, current[i])
 			if _, ok := IDPresents[current[i].ID]; ok {
-				return fmt.Errorf("compute plan error: Duplicate training task ID: %s", current[i].ID)
+				return errors.BadRequest("compute plan error: Duplicate training task ID: %s", current[i].ID)
 			}
 			IDPresents[current[i].ID] = current[i].Depth
 		} else {
@@ -90,7 +90,7 @@ func (dag *ComputeDAG) sort() error {
 			for _, c := range current {
 				errorIDs = append(errorIDs, c.ID)
 			}
-			return fmt.Errorf("compute plan error: Cyclic or missing dependency among inModels IDs: %v", errorIDs)
+			return errors.BadRequest("compute plan error: Cyclic or missing dependency among inModels IDs: %v", errorIDs)
 		}
 		i = 0
 		current = temp

chaincode/compute_plan_test.go

@@ -15,7 +15,6 @@
 package main
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -240,7 +239,7 @@ func validateTupleRank(t *testing.T, db *LedgerDB, expectedRank int, key string,
 		assert.NoError(t, err)
 		rank = tuple.Rank
 	default:
-		assert.NoError(t, fmt.Errorf("not implemented: %v", assetType))
+		t.Errorf("not implemented: %s", assetType)
 	}
 	assert.Equal(t, expectedRank, rank, "Rank for tuple of type %v with key \"%s\" should be %d", assetType, key, expectedRank)
 }

chaincode/data.go

@@ -16,7 +16,6 @@ package main
 
 import (
 	"chaincode/errors"
-	"fmt"
 	"strconv"
 	"strings"
 )
@@ -53,10 +52,6 @@ func (dataManager *DataManager) Set(db *LedgerDB, inp inputDataManager) (string,
 // and returning corresponding dataSample hashes, associated dataManagers, testOnly and errors
 func setDataSample(db *LedgerDB, inp inputDataSample) (dataSampleHashes []string, dataSample DataSample, err error) {
 	dataSampleHashes = inp.Hashes
-	if err = checkHashes(dataSampleHashes); err != nil {
-		err = errors.BadRequest(err)
-		return
-	}
 	// check dataSample is not already in the ledger
 	if existingKeys := checkDataSamplesExist(db, dataSampleHashes); existingKeys != nil {
 		err = errors.Conflict("data samples with keys %s already exist", existingKeys).WithKeys(existingKeys)
@@ -92,11 +87,6 @@ func setDataSample(db *LedgerDB, inp inputDataSample) (dataSampleHashes []string
 // one or more dataSamplef
 func validateUpdateDataSample(db *LedgerDB, inp inputUpdateDataSample) (dataSampleHashes []string, dataManagerKeys []string, err error) {
 	// TODO return full dataSample
-	// check validity of dataSampleHashes
-	if err = checkHashes(inp.Hashes); err != nil {
-		err = errors.BadRequest(err)
-		return
-	}
 	// check dataManagers exist and are owned by the transaction requester
 	if err = checkDataManagerOwner(db, inp.DataManagerKeys); err != nil {
 		return
@@ -323,7 +313,7 @@ func queryDataset(db *LedgerDB, args []string) (outputDataset, error) {
 func queryDataSamples(db *LedgerDB, args []string) ([]outputDataSample, error) {
 	outDataSamples := []outputDataSample{}
 	if len(args) != 0 {
-		err := fmt.Errorf("incorrect number of arguments, expecting nothing")
+		err := errors.BadRequest("incorrect number of arguments, expecting nothing")
 		return outDataSamples, err
 	}
 	elementsKeys, err := db.GetIndexKeys("dataSample~dataManager~key", []string{"dataSample"})
@@ -393,7 +383,7 @@ func checkSameDataManager(db *LedgerDB, dataManagerKey string, dataSampleKeys []
 			return testOnly, trainOnly, err
 		}
 		if !stringInSlice(dataManagerKey, dataSample.DataManagerKeys) {
-			err = fmt.Errorf("dataSample do not belong to the same dataManager")
+			err = errors.BadRequest("dataSample do not belong to the same dataManager")
 			return testOnly, trainOnly, err
 		}
 		testOnly = testOnly && dataSample.TestOnly

chaincode/data_test.go

@@ -66,7 +66,7 @@ func TestDataManager(t *testing.T) {
 	resp = mockStub.MockInvoke("42", args)
 	assert.EqualValuesf(t, 200, resp.Status, "when querying the dataManager, status %d and message %s", resp.Status, resp.Message)
 	dataManager := outputDataManager{}
-	err = bytesToStruct(resp.Payload, &dataManager)
+	err = json.Unmarshal(resp.Payload, &dataManager)
 	assert.NoError(t, err, "when unmarshalling queried dataManager")
 	expectedDataManager := outputDataManager{
 		ObjectiveKey: inpDataManager.ObjectiveKey,

chaincode/generate_examples_test.go

@@ -123,7 +123,7 @@ func TestPipeline(t *testing.T) {
 	assert.EqualValuesf(t, 200, resp.Status, "when adding traintuple with status %d and message %s", resp.Status, resp.Message)
 	traintuple := outputTraintuple{}
 	respTraintuple := resp.Payload
-	if err := bytesToStruct(respTraintuple, &traintuple); err != nil {
+	if err := json.Unmarshal(respTraintuple, &traintuple); err != nil {
 		t.Errorf("when unmarshalling queried traintuple with error %s", err)
 	}
 	trainWorker := traintuple.Dataset.Worker
@@ -185,7 +185,7 @@ func TestPipeline(t *testing.T) {
 	resp = mockStub.MockInvoke("42", args)
 	respTesttuple := resp.Payload
 	testtuple := outputTesttuple{}
-	if err := bytesToStruct(respTesttuple, &testtuple); err != nil {
+	if err := json.Unmarshal(respTesttuple, &testtuple); err != nil {
 		t.Errorf("when unmarshalling queried testtuple with error %s", err)
 	}
 	testWorker := testtuple.Dataset.Worker