Log (and throw away) the error reason for rejected definition broadcasts

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
hyperledger · Apr 18, 2023 · 506faeb · 506faeb
1 parent 7500330
commit 506faeb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/internal/events/aggregator.go b/internal/events/aggregator.go
@@ -606,6 +606,10 @@ func (ag *aggregator) readyForDispatch(ctx context.Context, msg *core.Message, d
 		var handlerResult definitions.HandlerResult
 		handlerResult, err = ag.definitions.HandleDefinitionBroadcast(ctx, &state.BatchState, msg, data, tx)
 		log.L(ctx).Infof("Result of definition broadcast '%s' [%s]: %s", msg.Header.Tag, msg.Header.ID, handlerResult.Action)
+		if handlerResult.Action == core.ActionReject {
+			log.L(ctx).Infof("Definition broadcast '%s' rejected: %s", msg.Header.ID, err)
+			err = nil
+		}
 		correlator = handlerResult.CustomCorrelator
 		action = handlerResult.Action
 

diff --git a/internal/events/aggregator_test.go b/internal/events/aggregator_test.go
@@ -1874,6 +1874,20 @@ func TestDefinitionBroadcastActionRetry(t *testing.T) {
 
 }
 
+func TestDefinitionBroadcastActionReject(t *testing.T) {
+	ag := newTestAggregator()
+	defer ag.cleanup(t)
+
+	msg1, _, _, _ := newTestManifest(core.MessageTypeDefinition, nil)
+
+	ag.mdh.On("HandleDefinitionBroadcast", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+		Return(definitions.HandlerResult{Action: core.ActionReject}, fmt.Errorf("pop"))
+
+	_, _, err := ag.readyForDispatch(ag.ctx, msg1, nil, nil, &batchState{}, &core.Pin{Signer: "0x12345"})
+	assert.NoError(t, err)
+
+}
+
 func TestDefinitionBroadcastRejectSignerLookupWrongOrg(t *testing.T) {
 	ag := newTestAggregator()
 	defer ag.cleanup(t)