Skip to content
This repository was archived by the owner on Sep 6, 2022. It is now read-only.

Commit 502b1cb

Browse files
authored
Merge pull request #121 from SubstraFoundation/add_metadata_to_compute_plan
Add metadata to compute plan
2 parents 7b8bb36 + d4280dc commit 502b1cb

File tree

7 files changed

+56
-30
lines changed

7 files changed

+56
-30
lines changed

EXAMPLES.md

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Smart contract: `registerDataManager`
3030
"authorizedIDs": [string] (required),
3131
},
3232
},
33-
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
33+
"metadata": map (lte=100,dive,keys,lte=50,endkeys,lte=100),
3434
}
3535
```
3636
##### Command peer example:
@@ -127,7 +127,7 @@ Smart contract: `registerObjective`
127127
"authorizedIDs": [string] (required),
128128
},
129129
},
130-
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
130+
"metadata": map (lte=100,dive,keys,lte=50,endkeys,lte=100),
131131
}
132132
```
133133
##### Command peer example:
@@ -157,7 +157,7 @@ Smart contract: `registerAlgo`
157157
"authorizedIDs": [string] (required),
158158
},
159159
},
160-
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
160+
"metadata": map (lte=100,dive,keys,lte=50,endkeys,lte=100),
161161
}
162162
```
163163
##### Command peer example:
@@ -317,7 +317,7 @@ Smart contract: `createTraintuple`
317317
"computePlanID": string (omitempty),
318318
"rank": string (omitempty),
319319
"tag": string (omitempty,lte=64),
320-
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
320+
"metadata": map (lte=100,dive,keys,lte=50,endkeys,lte=100),
321321
}
322322
```
323323
##### Command peer example:
@@ -343,7 +343,7 @@ Smart contract: `createTraintuple`
343343
"computePlanID": string (omitempty),
344344
"rank": string (omitempty),
345345
"tag": string (omitempty,lte=64),
346-
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
346+
"metadata": map (lte=100,dive,keys,lte=50,endkeys,lte=100),
347347
}
348348
```
349349
##### Command peer example:
@@ -1351,19 +1351,22 @@ Smart contract: `createComputePlan`
13511351
```go
13521352
{
13531353
"tag": string (omitempty,lte=64),
1354+
"metadata": map (lte=100,dive,keys,lte=50,endkeys,lte=100),
13541355
"traintuples": (omitempty) [{
13551356
"dataManagerKey": string (required,len=64,hexadecimal),
13561357
"dataSampleKeys": [string] (required,dive,len=64,hexadecimal),
13571358
"algoKey": string (required,len=64,hexadecimal),
13581359
"id": string (required,lte=64),
13591360
"inModelsIDs": [string] (omitempty,dive,lte=64),
13601361
"tag": string (omitempty,lte=64),
1362+
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
13611363
}],
13621364
"aggregatetuples": (omitempty) [{
13631365
"algoKey": string (required,len=64,hexadecimal),
13641366
"id": string (required,lte=64),
13651367
"inModelsIDs": [string] (omitempty,dive,lte=64),
13661368
"tag": string (omitempty,lte=64),
1369+
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
13671370
"worker": string (required),
13681371
}],
13691372
"compositeTraintuples": (omitempty) [{
@@ -1380,19 +1383,21 @@ Smart contract: `createComputePlan`
13801383
},
13811384
},
13821385
"tag": string (omitempty,lte=64),
1386+
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
13831387
}],
13841388
"testtuples": (omitempty) [{
13851389
"dataManagerKey": string (omitempty,len=64,hexadecimal),
13861390
"dataSampleKeys": [string] (omitempty,dive,len=64,hexadecimal),
13871391
"objectiveKey": string (required,len=64,hexadecimal),
13881392
"tag": string (omitempty,lte=64),
1393+
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
13891394
"traintupleID": string (required,lte=64),
13901395
}],
13911396
}
13921397
```
13931398
##### Command peer example:
13941399
```bash
1395-
peer chaincode invoke -n mycc -c '{"Args":["createComputePlan","{\"cleanModels\":false,\"tag\":\"a tag is simply a string\",\"traintuples\":[{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"aa1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"algoKey\":\"fd1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"id\":\"firstTraintupleID\",\"inModelsIDs\":null,\"tag\":\"\"},{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"aa2bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"algoKey\":\"fd1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"id\":\"secondTraintupleID\",\"inModelsIDs\":[\"firstTraintupleID\"],\"tag\":\"\"}],\"aggregatetuples\":null,\"compositeTraintuples\":null,\"testtuples\":[{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"bb1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"bb2bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"objectiveKey\":\"5c1d9cd1c2c1082dde0921b56d11030c81f62fbb51932758b58ac2569dd0b379\",\"tag\":\"\",\"traintupleID\":\"secondTraintupleID\"}]}"]}' -C myc
1400+
peer chaincode invoke -n mycc -c '{"Args":["createComputePlan","{\"cleanModels\":false,\"tag\":\"a tag is simply a string\",\"metadata\":null,\"traintuples\":[{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"aa1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"algoKey\":\"fd1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"id\":\"firstTraintupleID\",\"inModelsIDs\":null,\"tag\":\"\",\"metadata\":null},{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"aa2bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"algoKey\":\"fd1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"id\":\"secondTraintupleID\",\"inModelsIDs\":[\"firstTraintupleID\"],\"tag\":\"\",\"metadata\":null}],\"aggregatetuples\":null,\"compositeTraintuples\":null,\"testtuples\":[{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"bb1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"bb2bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"objectiveKey\":\"5c1d9cd1c2c1082dde0921b56d11030c81f62fbb51932758b58ac2569dd0b379\",\"tag\":\"\",\"metadata\":null,\"traintupleID\":\"secondTraintupleID\"}]}"]}' -C myc
13961401
```
13971402
##### Command output:
13981403
```json
@@ -1406,6 +1411,7 @@ peer chaincode invoke -n mycc -c '{"Args":["createComputePlan","{\"cleanModels\"
14061411
"compositeTraintupleKeys": null,
14071412
"computePlanID": "7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17",
14081413
"doneCount": 0,
1414+
"metadata": {},
14091415
"status": "todo",
14101416
"tag": "a tag is simply a string",
14111417
"testtupleKeys": [
@@ -1432,12 +1438,14 @@ Smart contract: `updateComputePlan`
14321438
"id": string (required,lte=64),
14331439
"inModelsIDs": [string] (omitempty,dive,lte=64),
14341440
"tag": string (omitempty,lte=64),
1441+
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
14351442
}],
14361443
"aggregatetuples": (omitempty) [{
14371444
"algoKey": string (required,len=64,hexadecimal),
14381445
"id": string (required,lte=64),
14391446
"inModelsIDs": [string] (omitempty,dive,lte=64),
14401447
"tag": string (omitempty,lte=64),
1448+
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
14411449
"worker": string (required),
14421450
}],
14431451
"compositeTraintuples": (omitempty) [{
@@ -1454,19 +1462,21 @@ Smart contract: `updateComputePlan`
14541462
},
14551463
},
14561464
"tag": string (omitempty,lte=64),
1465+
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
14571466
}],
14581467
"testtuples": (omitempty) [{
14591468
"dataManagerKey": string (omitempty,len=64,hexadecimal),
14601469
"dataSampleKeys": [string] (omitempty,dive,len=64,hexadecimal),
14611470
"objectiveKey": string (required,len=64,hexadecimal),
14621471
"tag": string (omitempty,lte=64),
1472+
"metadata": map (omitempty,lte=100,dive,keys,lte=50,endkeys,lte=100),
14631473
"traintupleID": string (required,lte=64),
14641474
}],
14651475
}
14661476
```
14671477
##### Command peer example:
14681478
```bash
1469-
peer chaincode invoke -n mycc -c '{"Args":["updateComputePlan","{\"computePlanID\":\"7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17\",\"traintuples\":[{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"aa1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"algoKey\":\"fd1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"id\":\"thirdTraintupleID\",\"inModelsIDs\":[\"firstTraintupleID\",\"secondTraintupleID\"],\"tag\":\"\"}],\"aggregatetuples\":null,\"compositeTraintuples\":null,\"testtuples\":[{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"bb1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"bb2bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"objectiveKey\":\"5c1d9cd1c2c1082dde0921b56d11030c81f62fbb51932758b58ac2569dd0b379\",\"tag\":\"\",\"traintupleID\":\"thirdTraintupleID\"}]}"]}' -C myc
1479+
peer chaincode invoke -n mycc -c '{"Args":["updateComputePlan","{\"computePlanID\":\"7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17\",\"traintuples\":[{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"aa1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"algoKey\":\"fd1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"id\":\"thirdTraintupleID\",\"inModelsIDs\":[\"firstTraintupleID\",\"secondTraintupleID\"],\"tag\":\"\",\"metadata\":null}],\"aggregatetuples\":null,\"compositeTraintuples\":null,\"testtuples\":[{\"dataManagerKey\":\"da1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"dataSampleKeys\":[\"bb1bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\",\"bb2bb7c31f62244c0f3a761cc168804227115793d01c270021fe3f7935482dcc\"],\"objectiveKey\":\"5c1d9cd1c2c1082dde0921b56d11030c81f62fbb51932758b58ac2569dd0b379\",\"tag\":\"\",\"metadata\":null,\"traintupleID\":\"thirdTraintupleID\"}]}"]}' -C myc
14701480
```
14711481
##### Command output:
14721482
```json
@@ -1479,6 +1489,7 @@ peer chaincode invoke -n mycc -c '{"Args":["updateComputePlan","{\"computePlanID
14791489
"compositeTraintupleKeys": null,
14801490
"computePlanID": "7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17",
14811491
"doneCount": 0,
1492+
"metadata": {},
14821493
"status": "todo",
14831494
"tag": "a tag is simply a string",
14841495
"testtupleKeys": [
@@ -1578,6 +1589,7 @@ peer chaincode invoke -n mycc -c '{"Args":["queryComputePlan","{\"key\":\"7dd808
15781589
"compositeTraintupleKeys": null,
15791590
"computePlanID": "7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17",
15801591
"doneCount": 0,
1592+
"metadata": {},
15811593
"status": "todo",
15821594
"tag": "a tag is simply a string",
15831595
"testtupleKeys": [
@@ -1606,6 +1618,7 @@ peer chaincode invoke -n mycc -c '{"Args":["queryComputePlans"]}' -C myc
16061618
"compositeTraintupleKeys": null,
16071619
"computePlanID": "7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17",
16081620
"doneCount": 0,
1621+
"metadata": {},
16091622
"status": "todo",
16101623
"tag": "a tag is simply a string",
16111624
"testtupleKeys": [
@@ -1643,6 +1656,7 @@ peer chaincode invoke -n mycc -c '{"Args":["cancelComputePlan","{\"key\":\"7dd80
16431656
"compositeTraintupleKeys": null,
16441657
"computePlanID": "7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17",
16451658
"doneCount": 0,
1659+
"metadata": {},
16461660
"status": "canceled",
16471661
"tag": "a tag is simply a string",
16481662
"testtupleKeys": [

chaincode/compute_plan.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ func (inpTraintuple *inputTraintuple) Fill(inpCP inputComputePlanTraintuple, IDT
2424
inpTraintuple.DataSampleKeys = inpCP.DataSampleKeys
2525
inpTraintuple.AlgoKey = inpCP.AlgoKey
2626
inpTraintuple.Tag = inpCP.Tag
27+
inpTraintuple.Metadata = inpCP.Metadata
2728

2829
// Set the inModels by matching the id to tuples key previously
2930
// encontered in this compute plan
@@ -41,6 +42,7 @@ func (inpTraintuple *inputTraintuple) Fill(inpCP inputComputePlanTraintuple, IDT
4142
func (inpAggregatetuple *inputAggregatetuple) Fill(inpCP inputComputePlanAggregatetuple, IDToTrainTask map[string]TrainTask) error {
4243
inpAggregatetuple.AlgoKey = inpCP.AlgoKey
4344
inpAggregatetuple.Tag = inpCP.Tag
45+
inpAggregatetuple.Metadata = inpCP.Metadata
4446
inpAggregatetuple.Worker = inpCP.Worker
4547

4648
// Set the inModels by matching the id to tuples key previously
@@ -61,6 +63,7 @@ func (inpCompositeTraintuple *inputCompositeTraintuple) Fill(inpCP inputComputeP
6163
inpCompositeTraintuple.DataSampleKeys = inpCP.DataSampleKeys
6264
inpCompositeTraintuple.AlgoKey = inpCP.AlgoKey
6365
inpCompositeTraintuple.Tag = inpCP.Tag
66+
inpCompositeTraintuple.Metadata = inpCP.Metadata
6467
inpCompositeTraintuple.OutTrunkModelPermissions = inpCP.OutTrunkModelPermissions
6568

6669
// Set the inModels by matching the id to traintuples key previously
@@ -93,6 +96,7 @@ func (inpTesttuple *inputTesttuple) Fill(inpCP inputComputePlanTesttuple, IDToTr
9396
inpTesttuple.DataManagerKey = inpCP.DataManagerKey
9497
inpTesttuple.DataSampleKeys = inpCP.DataSampleKeys
9598
inpTesttuple.Tag = inpCP.Tag
99+
inpTesttuple.Metadata = inpCP.Metadata
96100
inpTesttuple.ObjectiveKey = inpCP.ObjectiveKey
97101

98102
return nil
@@ -105,7 +109,7 @@ func createComputePlan(db *LedgerDB, args []string) (resp outputComputePlan, err
105109
if err != nil {
106110
return
107111
}
108-
return createComputePlanInternal(db, inp.inputComputePlan, inp.Tag, inp.CleanModels)
112+
return createComputePlanInternal(db, inp.inputComputePlan, inp.Tag, inp.Metadata, inp.CleanModels)
109113
}
110114

111115
func updateComputePlan(db *LedgerDB, args []string) (resp outputComputePlan, err error) {
@@ -125,10 +129,11 @@ func updateComputePlan(db *LedgerDB, args []string) (resp outputComputePlan, err
125129
return updateComputePlanInternal(db, inp.ComputePlanID, inp.inputComputePlan)
126130
}
127131

128-
func createComputePlanInternal(db *LedgerDB, inp inputComputePlan, tag string, cleanModels bool) (resp outputComputePlan, err error) {
132+
func createComputePlanInternal(db *LedgerDB, inp inputComputePlan, tag string, metadata map[string]string, cleanModels bool) (resp outputComputePlan, err error) {
129133
var computePlan ComputePlan
130134
computePlan.State.Status = StatusWaiting
131135
computePlan.Tag = tag
136+
computePlan.Metadata = metadata
132137
computePlan.CleanModels = cleanModels
133138
ID, err := computePlan.Create(db)
134139
if err != nil {

chaincode/compute_plan_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func TestModelCompositionComputePlanWorkflow(t *testing.T) {
162162
mockStub.MockTransactionStart("42")
163163
db := NewLedgerDB(mockStub)
164164

165-
out, err := createComputePlanInternal(db, modelCompositionComputePlan, tag, false)
165+
out, err := createComputePlanInternal(db, modelCompositionComputePlan, tag, map[string]string{}, false)
166166
assert.NoError(t, err)
167167
assert.NotNil(t, db.event)
168168
assert.Len(t, db.event.CompositeTraintuples, 2)
@@ -285,7 +285,7 @@ func TestCreateComputePlanCompositeAggregate(t *testing.T) {
285285
},
286286
}
287287

288-
outCP, err := createComputePlanInternal(db, inCP, tag, false)
288+
outCP, err := createComputePlanInternal(db, inCP, tag, map[string]string{}, false)
289289
assert.NoError(t, err)
290290

291291
// Check the composite traintuples
@@ -327,7 +327,7 @@ func TestCreateComputePlan(t *testing.T) {
327327

328328
// Simply test method and return values
329329
inCP := defaultComputePlan
330-
outCP, err := createComputePlanInternal(db, inCP, tag, false)
330+
outCP, err := createComputePlanInternal(db, inCP, tag, map[string]string{}, false)
331331
assert.NoError(t, err)
332332
validateDefaultComputePlan(t, outCP)
333333

@@ -380,7 +380,7 @@ func TestQueryComputePlan(t *testing.T) {
380380

381381
// Simply test method and return values
382382
inCP := defaultComputePlan
383-
outCP, err := createComputePlanInternal(db, inCP, tag, false)
383+
outCP, err := createComputePlanInternal(db, inCP, tag, map[string]string{}, false)
384384
assert.NoError(t, err)
385385
assert.NotNil(t, outCP)
386386

@@ -400,7 +400,7 @@ func TestQueryComputePlans(t *testing.T) {
400400

401401
// Simply test method and return values
402402
inCP := defaultComputePlan
403-
outCP, err := createComputePlanInternal(db, inCP, tag, false)
403+
outCP, err := createComputePlanInternal(db, inCP, tag, map[string]string{}, false)
404404
assert.NoError(t, err)
405405
assert.NotNil(t, outCP)
406406

@@ -448,7 +448,7 @@ func TestComputePlanEmptyTesttuples(t *testing.T) {
448448
Testtuples: []inputComputePlanTesttuple{},
449449
}
450450

451-
outCP, err := createComputePlanInternal(db, inCP, tag, false)
451+
outCP, err := createComputePlanInternal(db, inCP, tag, map[string]string{}, false)
452452
assert.NoError(t, err)
453453
assert.NotNil(t, outCP)
454454
assert.Len(t, outCP.TesttupleKeys, 0)
@@ -485,7 +485,7 @@ func TestCancelComputePlan(t *testing.T) {
485485
mockStub.MockTransactionStart("42")
486486
db := NewLedgerDB(mockStub)
487487

488-
out, err := createComputePlanInternal(db, modelCompositionComputePlan, tag, false)
488+
out, err := createComputePlanInternal(db, modelCompositionComputePlan, tag, map[string]string{}, false)
489489
assert.NoError(t, err)
490490
assert.NotNil(t, db.event)
491491
assert.Len(t, db.event.CompositeTraintuples, 2)
@@ -527,7 +527,7 @@ func TestStartedTuplesOfCanceledComputePlan(t *testing.T) {
527527
mockStub.MockTransactionStart("42")
528528
db := NewLedgerDB(mockStub)
529529

530-
out, err := createComputePlanInternal(db, modelCompositionComputePlan, tag, false)
530+
out, err := createComputePlanInternal(db, modelCompositionComputePlan, tag, map[string]string{}, false)
531531
assert.NoError(t, err)
532532

533533
logStartCompositeTrain(db, assetToArgs(inputKey{out.CompositeTraintupleKeys[0]}))
@@ -559,7 +559,7 @@ func TestLogSuccessAfterCancel(t *testing.T) {
559559
mockStub.MockTransactionStart("42")
560560
db := NewLedgerDB(mockStub)
561561

562-
out, err := createComputePlanInternal(db, modelCompositionComputePlan, tag, false)
562+
out, err := createComputePlanInternal(db, modelCompositionComputePlan, tag, map[string]string{}, false)
563563
assert.NoError(t, err)
564564

565565
logStartCompositeTrain(db, assetToArgs(inputKey{out.CompositeTraintupleKeys[0]}))
@@ -603,7 +603,7 @@ func TestComputePlanMetrics(t *testing.T) {
603603
mockStub.MockTransactionStart("42")
604604
db := NewLedgerDB(mockStub)
605605

606-
out, err := createComputePlanInternal(db, defaultComputePlan, tag, false)
606+
out, err := createComputePlanInternal(db, defaultComputePlan, tag, map[string]string{}, false)
607607
assert.NoError(t, err)
608608
checkComputePlanMetrics(t, db, out.ComputePlanID, 0, 3)
609609

@@ -655,7 +655,7 @@ func TestUpdateComputePlan(t *testing.T) {
655655
registerItem(t, *mockStub, "aggregateAlgo")
656656
db := NewLedgerDB(mockStub)
657657

658-
out, err := createComputePlanInternal(db, inputComputePlan{}, tag, false)
658+
out, err := createComputePlanInternal(db, inputComputePlan{}, tag, map[string]string{}, false)
659659
assert.NoError(t, err)
660660
assert.Equal(t, tag, out.Tag)
661661

@@ -705,7 +705,7 @@ func TestCleanModels(t *testing.T) {
705705
registerItem(t, *mockStub, "aggregateAlgo")
706706
db := NewLedgerDB(mockStub)
707707

708-
out, err := createComputePlanInternal(db, defaultComputePlan, tag, true)
708+
out, err := createComputePlanInternal(db, defaultComputePlan, tag, map[string]string{}, true)
709709
assert.NoError(t, err)
710710
// Just created the compute plan so not in the event
711711
assert.Len(t, db.event.ComputePlans, 0)
@@ -741,7 +741,7 @@ func TestCreateSameComputePlanTwice(t *testing.T) {
741741
registerItem(t, *mockStub, "aggregateAlgo")
742742
db := NewLedgerDB(mockStub)
743743

744-
out, err := createComputePlanInternal(db, inputComputePlan{}, tag, false)
744+
out, err := createComputePlanInternal(db, inputComputePlan{}, tag, map[string]string{}, false)
745745
assert.NoError(t, err)
746746
assert.Equal(t, tag, out.Tag)
747747

@@ -782,7 +782,7 @@ func TestCreateSameComputePlanTwice(t *testing.T) {
782782
assert.NoError(t, err)
783783

784784
// Upload the same tuples inside another compute plan
785-
out, err = createComputePlanInternal(db, inputComputePlan{}, tag, false)
785+
out, err = createComputePlanInternal(db, inputComputePlan{}, tag, map[string]string{}, false)
786786
assert.NoError(t, err)
787787
assert.Equal(t, tag, out.Tag)
788788

0 commit comments

Comments
 (0)