Make sure to set CP ID before hashing (#118)

Author: thibaultrobert

EXAMPLES.md

@@ -1432,8 +1432,8 @@ peer chaincode invoke -n mycc -c '{"Args":["createComputePlan","{\"cleanModels\"
 ```json
 {
  "IDToKey": {
-  "firstTraintupleID": "a3cbf90bf2945cc7728f27894acf8e609fd65ef93340157f90706bd441d5f1b8",
-  "secondTraintupleID": "61f210813e18f3a7af124ff32d6f5a46a276d5ae9fdd5d5c6f49a8e49c88366d"
+  "firstTraintupleID": "01feb56691d26983a641d29f4c2a5b7098f99eb471b7e5f03aaa78c8ae142ca9",
+  "secondTraintupleID": "78914b1f480f5e81a26e4d04d88bdb27937e858c49c6bb9d1ae83ff6627ca0ab"
  },
  "__metrics__": {
   "duration": 0
@@ -1446,11 +1446,11 @@ peer chaincode invoke -n mycc -c '{"Args":["createComputePlan","{\"cleanModels\"
  "status": "todo",
  "tag": "a tag is simply a string",
  "testtupleKeys": [
-  "57c5c39799167b74ebe67974776b4149f5cc4ddde0e5811e75a19348191e2194"
+  "1ca3227c1a1232a55e31d11d93b1fe224f454c5a4508093a15a6cae2a220f957"
  ],
  "traintupleKeys": [
-  "a3cbf90bf2945cc7728f27894acf8e609fd65ef93340157f90706bd441d5f1b8",
-  "61f210813e18f3a7af124ff32d6f5a46a276d5ae9fdd5d5c6f49a8e49c88366d"
+  "01feb56691d26983a641d29f4c2a5b7098f99eb471b7e5f03aaa78c8ae142ca9",
+  "78914b1f480f5e81a26e4d04d88bdb27937e858c49c6bb9d1ae83ff6627ca0ab"
  ],
  "tupleCount": 3
 }
@@ -1509,7 +1509,7 @@ peer chaincode invoke -n mycc -c '{"Args":["updateComputePlan","{\"computePlanID
 ```json
 {
  "IDToKey": {
-  "thirdTraintupleID": "57a09687b8d26cc553eeac739fa6cc1c5e7f1a52a2ce2df277576eee7356282b"
+  "thirdTraintupleID": "17c7623e87be77d8f93f21401e2eae98384de4a1d7ee841c0b9e0a07897cfbbf"
  },
  "__metrics__": {
   "duration": 0
@@ -1522,13 +1522,13 @@ peer chaincode invoke -n mycc -c '{"Args":["updateComputePlan","{\"computePlanID
  "status": "todo",
  "tag": "a tag is simply a string",
  "testtupleKeys": [
-  "57c5c39799167b74ebe67974776b4149f5cc4ddde0e5811e75a19348191e2194",
-  "2c78d12bd921a74f057ba5e535c9fda224e551e9562de863fd729cf347ded369"
+  "1ca3227c1a1232a55e31d11d93b1fe224f454c5a4508093a15a6cae2a220f957",
+  "4395e03f727aa5ce5c3d8eb034e23871e57d9a6546a57b9a6f786bf1019e0b52"
  ],
  "traintupleKeys": [
-  "a3cbf90bf2945cc7728f27894acf8e609fd65ef93340157f90706bd441d5f1b8",
-  "61f210813e18f3a7af124ff32d6f5a46a276d5ae9fdd5d5c6f49a8e49c88366d",
-  "57a09687b8d26cc553eeac739fa6cc1c5e7f1a52a2ce2df277576eee7356282b"
+  "01feb56691d26983a641d29f4c2a5b7098f99eb471b7e5f03aaa78c8ae142ca9",
+  "78914b1f480f5e81a26e4d04d88bdb27937e858c49c6bb9d1ae83ff6627ca0ab",
+  "17c7623e87be77d8f93f21401e2eae98384de4a1d7ee841c0b9e0a07897cfbbf"
  ],
  "tupleCount": 5
 }
@@ -1625,13 +1625,13 @@ peer chaincode invoke -n mycc -c '{"Args":["queryComputePlan","{\"key\":\"7dd808
  "status": "todo",
  "tag": "a tag is simply a string",
  "testtupleKeys": [
-  "57c5c39799167b74ebe67974776b4149f5cc4ddde0e5811e75a19348191e2194",
-  "2c78d12bd921a74f057ba5e535c9fda224e551e9562de863fd729cf347ded369"
+  "1ca3227c1a1232a55e31d11d93b1fe224f454c5a4508093a15a6cae2a220f957",
+  "4395e03f727aa5ce5c3d8eb034e23871e57d9a6546a57b9a6f786bf1019e0b52"
  ],
  "traintupleKeys": [
-  "a3cbf90bf2945cc7728f27894acf8e609fd65ef93340157f90706bd441d5f1b8",
-  "61f210813e18f3a7af124ff32d6f5a46a276d5ae9fdd5d5c6f49a8e49c88366d",
-  "57a09687b8d26cc553eeac739fa6cc1c5e7f1a52a2ce2df277576eee7356282b"
+  "01feb56691d26983a641d29f4c2a5b7098f99eb471b7e5f03aaa78c8ae142ca9",
+  "78914b1f480f5e81a26e4d04d88bdb27937e858c49c6bb9d1ae83ff6627ca0ab",
+  "17c7623e87be77d8f93f21401e2eae98384de4a1d7ee841c0b9e0a07897cfbbf"
  ],
  "tupleCount": 5
 }
@@ -1653,13 +1653,13 @@ peer chaincode invoke -n mycc -c '{"Args":["queryComputePlans"]}' -C myc
   "status": "todo",
   "tag": "a tag is simply a string",
   "testtupleKeys": [
-   "57c5c39799167b74ebe67974776b4149f5cc4ddde0e5811e75a19348191e2194",
-   "2c78d12bd921a74f057ba5e535c9fda224e551e9562de863fd729cf347ded369"
+   "1ca3227c1a1232a55e31d11d93b1fe224f454c5a4508093a15a6cae2a220f957",
+   "4395e03f727aa5ce5c3d8eb034e23871e57d9a6546a57b9a6f786bf1019e0b52"
   ],
   "traintupleKeys": [
-   "a3cbf90bf2945cc7728f27894acf8e609fd65ef93340157f90706bd441d5f1b8",
-   "61f210813e18f3a7af124ff32d6f5a46a276d5ae9fdd5d5c6f49a8e49c88366d",
-   "57a09687b8d26cc553eeac739fa6cc1c5e7f1a52a2ce2df277576eee7356282b"
+   "01feb56691d26983a641d29f4c2a5b7098f99eb471b7e5f03aaa78c8ae142ca9",
+   "78914b1f480f5e81a26e4d04d88bdb27937e858c49c6bb9d1ae83ff6627ca0ab",
+   "17c7623e87be77d8f93f21401e2eae98384de4a1d7ee841c0b9e0a07897cfbbf"
   ],
   "tupleCount": 5
  }
@@ -1693,13 +1693,13 @@ peer chaincode invoke -n mycc -c '{"Args":["cancelComputePlan","{\"key\":\"7dd80
  "status": "canceled",
  "tag": "a tag is simply a string",
  "testtupleKeys": [
-  "57c5c39799167b74ebe67974776b4149f5cc4ddde0e5811e75a19348191e2194",
-  "2c78d12bd921a74f057ba5e535c9fda224e551e9562de863fd729cf347ded369"
+  "1ca3227c1a1232a55e31d11d93b1fe224f454c5a4508093a15a6cae2a220f957",
+  "4395e03f727aa5ce5c3d8eb034e23871e57d9a6546a57b9a6f786bf1019e0b52"
  ],
  "traintupleKeys": [
-  "a3cbf90bf2945cc7728f27894acf8e609fd65ef93340157f90706bd441d5f1b8",
-  "61f210813e18f3a7af124ff32d6f5a46a276d5ae9fdd5d5c6f49a8e49c88366d",
-  "57a09687b8d26cc553eeac739fa6cc1c5e7f1a52a2ce2df277576eee7356282b"
+  "01feb56691d26983a641d29f4c2a5b7098f99eb471b7e5f03aaa78c8ae142ca9",
+  "78914b1f480f5e81a26e4d04d88bdb27937e858c49c6bb9d1ae83ff6627ca0ab",
+  "17c7623e87be77d8f93f21401e2eae98384de4a1d7ee841c0b9e0a07897cfbbf"
  ],
  "tupleCount": 5
 }

chaincode/compute_plan_test.go

@@ -733,3 +733,59 @@ func TestCleanModels(t *testing.T) {
 	assert.Len(t, db.event.ComputePlans[0].ModelsToDelete, 0)
 
 }
+
+func TestCreateSameComputePlanTwice(t *testing.T) {
+	scc := new(SubstraChaincode)
+	mockStub := NewMockStubWithRegisterNode("substra", scc)
+	mockStub.MockTransactionStart("42")
+	registerItem(t, *mockStub, "aggregateAlgo")
+	db := NewLedgerDB(mockStub)
+
+	out, err := createComputePlanInternal(db, inputComputePlan{}, tag, false)
+	assert.NoError(t, err)
+	assert.Equal(t, tag, out.Tag)
+
+	up := inputComputePlan{
+		Traintuples: []inputComputePlanTraintuple{
+			{
+				DataManagerKey: dataManagerOpenerHash,
+				DataSampleKeys: []string{trainDataSampleHash1},
+				AlgoKey:        algoHash,
+				ID:             "traintuple",
+			},
+		},
+		CompositeTraintuples: []inputComputePlanCompositeTraintuple{
+			{
+				DataManagerKey: dataManagerOpenerHash,
+				DataSampleKeys: []string{trainDataSampleHash1},
+				AlgoKey:        compositeAlgoHash,
+				ID:             "CompositeTraintuple",
+			},
+		},
+		Aggregatetuples: []inputComputePlanAggregatetuple{
+			{
+				AlgoKey: aggregateAlgoHash,
+				ID:      "Aggregatetuple",
+				Worker:  worker,
+			},
+		},
+		Testtuples: []inputComputePlanTesttuple{
+			{
+				DataManagerKey: dataManagerOpenerHash,
+				DataSampleKeys: []string{testDataSampleHash1},
+				ObjectiveKey:   objectiveDescriptionHash,
+				TraintupleID:   "traintuple",
+			},
+		},
+	}
+	out, err = updateComputePlanInternal(db, out.ComputePlanID, up)
+	assert.NoError(t, err)
+
+	// Upload the same tuples inside another compute plan
+	out, err = createComputePlanInternal(db, inputComputePlan{}, tag, false)
+	assert.NoError(t, err)
+	assert.Equal(t, tag, out.Tag)
+
+	out, err = updateComputePlanInternal(db, out.ComputePlanID, defaultComputePlan)
+	assert.NoError(t, err)
+}

chaincode/traintuple.go

@@ -42,6 +42,8 @@ func (traintuple *Traintuple) SetFromInput(db *LedgerDB, inp inputTraintuple) er
 	traintuple.AssetType = TraintupleType
 	traintuple.Creator = creator
 	traintuple.Tag = inp.Tag
+	traintuple.ComputePlanID = inp.ComputePlanID
+
 	algo, err := db.GetAlgo(inp.AlgoKey)
 	if err != nil {
 		return errors.BadRequest(err, "could not retrieve algo with key %s", inp.AlgoKey)

chaincode/traintuple_composite.go

@@ -40,6 +40,7 @@ func (traintuple *CompositeTraintuple) SetFromInput(db *LedgerDB, inp inputCompo
 	traintuple.AssetType = CompositeTraintupleType
 	traintuple.Creator = creator
 	traintuple.Tag = inp.Tag
+	traintuple.ComputePlanID = inp.ComputePlanID
 	algo, err := db.GetCompositeAlgo(inp.AlgoKey)
 	if err != nil {
 		return errors.BadRequest(err, "could not retrieve Composite algo with key %s", inp.AlgoKey)

chaincode/tuple_aggregate.go

@@ -38,6 +38,8 @@ func (tuple *Aggregatetuple) SetFromInput(db *LedgerDB, inp inputAggregatetuple)
 	tuple.AssetType = AggregatetupleType
 	tuple.Creator = creator
 	tuple.Tag = inp.Tag
+	tuple.ComputePlanID = inp.ComputePlanID
+
 	algo, err := db.GetAggregateAlgo(inp.AlgoKey)
 	if err != nil {
 		return errors.BadRequest(err, "could not retrieve algo with key %s", inp.AlgoKey)