Add CP ID to tuples hashes (#116)

Author: thibaultrobert

EXAMPLES.md

@@ -414,7 +414,10 @@ func UpdateComputePlanState(db *LedgerDB, ComputePlanID, tupleStatus, tupleKey s
 		return err
 	}
 	if statusUpdated || len(doneModels) != 0 {
-		db.AddComputePlanEvent(ComputePlanID, cp.State.Status, doneModels)
+		err = db.AddComputePlanEvent(ComputePlanID, cp.State.Status, doneModels)
+		if err != nil {
+			return err
+		}
 		return cp.SaveState(db)
 	}
 	return nil

chaincode/compute_plan.go

@@ -577,10 +577,10 @@ func TestLogSuccessAfterCancel(t *testing.T) {
 	computePlan, err := getOutComputePlan(db, out.ComputePlanID)
 	assert.Equal(t, StatusCanceled, computePlan.Status)
 
-	tuples, err := queryCompositeTraintuples(db, []string{})
-	assert.NoError(t, err)
-	expected := []string{StatusDone, StatusDoing, StatusAborted, StatusAborted}
-	for i, tuple := range tuples {
+	expected := []string{StatusDoing, StatusDone, StatusAborted, StatusAborted}
+	for i, tuplekey := range out.CompositeTraintupleKeys {
+		tuple, err := queryCompositeTraintuple(db, keyToArgs(tuplekey))
+		assert.NoError(t, err)
 		assert.Equal(t, expected[i], tuple.Status)
 	}
 }
@@ -624,6 +624,7 @@ func traintupleToDone(t *testing.T, db *LedgerDB, key string) {
 
 	success := inputLogSuccessTrain{}
 	success.Key = key
+	success.OutModel.Hash = GetRandomHash()
 	success.fillDefaults()
 	_, err = logSuccessTrain(db, assetToArgs(success))
 	assert.NoError(t, err)

chaincode/compute_plan_test.go

@@ -52,9 +52,9 @@ const headModelHash = modelHash
 const trunkModelHash = "ccdbb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482ecc"
 const trunkModelAddress = "https://substrabac/model/titi"
 const worker = "SampleOrg"
-const traintupleKey = "9da043ddc233996d2e62c196471290de4726fc59d65dbbd2b32a920326e8adf3"
-const compositeTraintupleKey = "57104c72d50215d8cfa288059fdf47bcc5f808f6685a5f08fa08f792cd782c68"
-const aggregatetupleKey = "af689258ffecdb5172b285b04475ac44941b7e6acd88a0d076059ce520cb0a95"
+const traintupleKey = "ebbf6cdde286539ea9cc34214dce7acb71e72799a676e4845be1b0fea155b35c"
+const compositeTraintupleKey = "b6f20e7ed89073d995c50d4b2bff6bb365a05b8d77f10469117d8aad81d83989"
+const aggregatetupleKey = "48c17bb556e1a122138d89178d81b22469a0cae260af322de9b391086ad27b2c"
 const tag = "a tag is simply a string"
 
 func TestInit(t *testing.T) {

chaincode/main_test.go

@@ -176,6 +176,7 @@ func (testtuple *Testtuple) GetKey() string {
 		testtuple.ObjectiveKey,
 		testtuple.Dataset.OpenerHash,
 		testtuple.Creator,
+		testtuple.ComputePlanID,
 	}
 	hashKeys = append(hashKeys, testtuple.Dataset.DataSampleKeys...)
 	return HashForKey("testtuple", hashKeys...)

chaincode/testtuple.go

@@ -104,7 +104,11 @@ func (traintuple *Traintuple) SetFromParents(db *LedgerDB, inModels []string) er
 
 // GetKey return the key of the traintuple depending on its key parameters.
 func (traintuple *Traintuple) GetKey() string {
-	hashKeys := []string{traintuple.Creator, traintuple.AlgoKey, traintuple.Dataset.DataManagerKey}
+	hashKeys := []string{
+		traintuple.Creator,
+		traintuple.AlgoKey,
+		traintuple.Dataset.DataManagerKey,
+		traintuple.ComputePlanID}
 	hashKeys = append(hashKeys, traintuple.Dataset.DataSampleKeys...)
 	hashKeys = append(hashKeys, traintuple.InModelKeys...)
 	return HashForKey("traintuple", hashKeys...)

chaincode/traintuple.go

@@ -150,7 +150,8 @@ func (traintuple *CompositeTraintuple) GetKey() string {
 		traintuple.AlgoKey,
 		traintuple.Dataset.DataManagerKey,
 		traintuple.InHeadModel,
-		traintuple.InTrunkModel}
+		traintuple.InTrunkModel,
+		traintuple.ComputePlanID}
 	hashKeys = append(hashKeys, traintuple.Dataset.DataSampleKeys...)
 	return HashForKey("compositeTraintuple", hashKeys...)
 }

chaincode/traintuple_composite.go

@@ -114,7 +114,7 @@ func (tuple *Aggregatetuple) SetFromParents(db *LedgerDB, inModels []string) err
 
 // GetKey return the key of the aggregate tuple depending on its key parameters.
 func (tuple *Aggregatetuple) GetKey() string {
-	hashKeys := []string{tuple.Creator, tuple.AlgoKey}
+	hashKeys := []string{tuple.Creator, tuple.AlgoKey, tuple.ComputePlanID}
 	hashKeys = append(hashKeys, tuple.InModelKeys...)
 	return HashForKey("aggregate-traintuple", hashKeys...)
 }