Run generate types and use gen'd type, add tests

smartcontractkit · Jan 9, 2025 · c01dbf0 · c01dbf0
1 parent 34eba99
commit c01dbf0
Show file tree

Hide file tree

Showing 10 changed files with 259 additions and 664 deletions.
diff --git a/pkg/capabilities/consensus/ocr3/ocr3cap/common_builders_generated.go b/pkg/capabilities/consensus/ocr3/ocr3cap/common_builders_generated.go
diff --git a/pkg/capabilities/consensus/ocr3/ocr3cap/identical_consensus.go b/pkg/capabilities/consensus/ocr3/ocr3cap/identical_consensus.go
@@ -10,7 +10,7 @@ import (
 type IdenticalConsensusConfig[T any] struct {
 	Encoder           Encoder
 	EncoderConfig     EncoderConfig
-	AggregationConfig map[string]interface{}
+	AggregationConfig AggregationConfig
 	ReportID          ReportId
 	KeyID             KeyId
 }

diff --git a/pkg/capabilities/consensus/ocr3/ocr3cap/identical_consensus_test.go b/pkg/capabilities/consensus/ocr3/ocr3cap/identical_consensus_test.go
@@ -20,10 +20,11 @@ func TestIdenticalConsensus(t *testing.T) {
 	trigger := basictrigger.TriggerConfig{Name: "1234", Number: 1}.New(workflow)
 
 	consensus := ocr3.IdenticalConsensusConfig[basictrigger.TriggerOutputs]{
-		Encoder:       ocr3.EncoderEVM,
-		EncoderConfig: ocr3.EncoderConfig{},
-		ReportID:      "0001",
-		KeyID:         "evm",
+		Encoder:           ocr3.EncoderEVM,
+		EncoderConfig:     ocr3.EncoderConfig{},
+		AggregationConfig: ocr3.AggregationConfig{},
+		ReportID:          "0001",
+		KeyID:             "evm",
 	}.New(workflow, "consensus", ocr3.IdenticalConsensusInput[basictrigger.TriggerOutputs]{
 		Observation:   trigger,
 		Encoder:       "evm",
@@ -66,6 +67,7 @@ func TestIdenticalConsensus(t *testing.T) {
 					"encoder":            "EVM",
 					"encoder_config":     map[string]any{},
 					"aggregation_method": "identical",
+					"aggregation_config": map[string]any{},
 					"report_id":          "0001",
 					"key_id":             "evm",
 				},

diff --git a/pkg/capabilities/consensus/ocr3/ocr3cap/ocr3cap_common-schema.json b/pkg/capabilities/consensus/ocr3/ocr3cap/ocr3cap_common-schema.json
@@ -52,6 +52,10 @@
       "type": "object",
       "additionalProperties": true
     },
+    "aggregation_config": {
+      "type": "object",
+      "additionalProperties": true
+    },
     "key_id" : {
       "type": "string",
       "examples": [

diff --git a/pkg/capabilities/consensus/ocr3/ocr3cap/ocr3cap_common_generated.go b/pkg/capabilities/consensus/ocr3/ocr3cap/ocr3cap_common_generated.go
diff --git a/pkg/capabilities/consensus/ocr3/types/ocr3_types.pb.go b/pkg/capabilities/consensus/ocr3/types/ocr3_types.pb.go