Merge pull request #76 from kaleido-io/ffi-topic

peterbroadhurst · web-flow · commit 681565166505 · 2023-06-22T22:41:35.000-04:00
Use NetworkName instead of Name for FFI definition topic
diff --git a/pkg/fftypes/ffi.go b/pkg/fftypes/ffi.go
@@ -125,7 +125,7 @@ func (f *FFI) Validate(ctx context.Context) (err error) {
 }
 
 func (f *FFI) Topic() string {
-	return TypeNamespaceNameTopicHash("ffi", f.Namespace, f.Name)
+	return TypeNamespaceNameTopicHash("ffi", f.Namespace, f.NetworkName)
 }
 
 func (f *FFI) SetBroadcastMessage(msgID *UUID) {
diff --git a/pkg/fftypes/ffi_test.go b/pkg/fftypes/ffi_test.go
@@ -150,9 +150,10 @@ func TestFFIParamsValue(t *testing.T) {
 
 func TestFFITopic(t *testing.T) {
 	ffi := &FFI{
-		Namespace: "ns1",
+		Namespace:   "ns1",
+		NetworkName: "math",
 	}
-	assert.Equal(t, "01a982a7251400a7ec64fccce6febee3942a56e37967fa2ba26d7d6f43523c82", ffi.Topic())
+	assert.Equal(t, "c310d11a9bce752d9ee2a93cc86176f668eb6007b701c844a4eb3321f0f8ebf4", ffi.Topic())
 }
 
 func TestFFISetBroadCastMessage(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (f *FFI) Validate(ctx context.Context) (err error) {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`func (f *FFI) Topic() string {`
`128`		`- return TypeNamespaceNameTopicHash("ffi", f.Namespace, f.Name)`
	`128`	`+ return TypeNamespaceNameTopicHash("ffi", f.Namespace, f.NetworkName)`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`func (f FFI) SetBroadcastMessage(msgID UUID) {`
Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,10 @@ func TestFFIParamsValue(t *testing.T) {`
`150`	`150`
`151`	`151`	`func TestFFITopic(t *testing.T) {`
`152`	`152`	`ffi := &FFI{`
`153`		`- Namespace: "ns1",`
	`153`	`+ Namespace: "ns1",`
	`154`	`+ NetworkName: "math",`
`154`	`155`	`}`
`155`		`- assert.Equal(t, "01a982a7251400a7ec64fccce6febee3942a56e37967fa2ba26d7d6f43523c82", ffi.Topic())`
	`156`	`+ assert.Equal(t, "c310d11a9bce752d9ee2a93cc86176f668eb6007b701c844a4eb3321f0f8ebf4", ffi.Topic())`
`156`	`157`	`}`
`157`	`158`
`158`	`159`	`func TestFFISetBroadCastMessage(t *testing.T) {`