renaming dxconnect callback since it isnt an event persay

Signed-off-by: hfuss <hayden.fuss@kaleido.io>

Author: onelapahead

internal/dataexchange/ffdx/ffdx.go

@@ -297,7 +297,7 @@ func (h *FFDX) beforeConnect(ctx context.Context, w wsclient.WSClient) error {
 	}
 
 	for _, cb := range h.callbacks.handlers {
-		err := cb.DXConnectEvent(h)
+		err := cb.DXConnect(h)
 		if err != nil {
 			log.L(ctx).Errorf("error handling DX connect event: %v", err)
 		}

internal/dataexchange/ffdx/ffdx_test.go

@@ -488,7 +488,7 @@ func TestMessageEventsBackgroundStart(t *testing.T) {
 	h.SetOperationHandler("ns1", ocb)
 	h.AddNode(context.Background(), "ns1", "node1", fftypes.JSONObject{"id": "peer1"})
 
-	mcb.On("DXConnectEvent", h).Return(nil)
+	mcb.On("DXConnect", h).Return(nil)
 
 	err := h.Start()
 	assert.NoError(t, err)
@@ -549,7 +549,7 @@ func TestMessageEvents(t *testing.T) {
 	ocb := &coremocks.OperationCallbacks{}
 	h.SetOperationHandler("ns1", ocb)
 	h.AddNode(context.Background(), "ns1", "node1", fftypes.JSONObject{"id": "peer1"})
-	mcb.On("DXConnectEvent", h).Return(nil)
+	mcb.On("DXConnect", h).Return(nil)
 
 	err := h.Start()
 	assert.NoError(t, err)
@@ -615,7 +615,7 @@ func TestBlobEvents(t *testing.T) {
 	ocb := &coremocks.OperationCallbacks{}
 	h.SetOperationHandler("ns1", ocb)
 	h.AddNode(context.Background(), "ns1", "node1", fftypes.JSONObject{"id": "peer1"})
-	mcb.On("DXConnectEvent", h).Return(nil)
+	mcb.On("DXConnect", h).Return(nil)
 
 	err := h.Start()
 	assert.NoError(t, err)

internal/orchestrator/bound_callbacks.go

@@ -98,6 +98,6 @@ func (bc *boundCallbacks) TokensApproved(plugin tokens.Plugin, approval *tokens.
 	return bc.o.events.TokensApproved(plugin, approval)
 }
 
-func (bc *boundCallbacks) DXConnectEvent(plugin dataexchange.Plugin) error {
+func (bc *boundCallbacks) DXConnect(plugin dataexchange.Plugin) error {
 	return bc.o.NetworkMap().CheckNodeIdentityStatus(bc.o.ctx)
 }

internal/orchestrator/bound_callbacks_test.go

@@ -136,7 +136,7 @@ func TestBoundCallbacksStopped(t *testing.T) {
 	err = bc.DXEvent(nil, &dataexchangemocks.DXEvent{})
 	assert.Regexp(t, "FF10446", err)
 
-	err = bc.DXConnectEvent(nil)
+	err = bc.DXConnect(nil)
 	assert.Regexp(t, "FF10446", err)
 
 	err = bc.TokenPoolCreated(context.Background(), nil, &tokens.TokenPool{})

mocks/dataexchangemocks/callbacks.go

@@ -105,7 +105,7 @@ type Plugin interface {
 
 // Callbacks is the interface provided to the data exchange plugin, to allow it to pass events back to firefly.
 type Callbacks interface {
-	DXConnectEvent(plugin Plugin) error
+	DXConnect(plugin Plugin) error
 	// Event has sub-types as defined below, and can be processed and ack'd asynchronously
 	DXEvent(plugin Plugin, event DXEvent) error
 }