diff --git a/pkg/batchfetcher/batchfetcher.go b/pkg/batchfetcher/batchfetcher.go index 7e8952e1d..f1f778a49 100644 --- a/pkg/batchfetcher/batchfetcher.go +++ b/pkg/batchfetcher/batchfetcher.go @@ -137,7 +137,6 @@ func NewModule(mc *ModuleConfig, epochNr t.EpochNr, clientProgress *clientprogre // At the time of forwarding, submit the client progress to the checkpointing protocol. f: func(_ *eventpb.Event) { clientProgress.GarbageCollect() - //commonpbdsl.ClientProgress(m, mc.Checkpoint, clientProgress.ClientTrackers) dsl.EmitEvent(m, bfevents.ClientProgress( mc.Checkpoint.Then(t.ModuleID(fmt.Sprintf("%v", epochNr))), clientProgress.Pb(), diff --git a/pkg/batchfetcher/events/events.go b/pkg/batchfetcher/events/events.go index d496ec77e..6545e587c 100644 --- a/pkg/batchfetcher/events/events.go +++ b/pkg/batchfetcher/events/events.go @@ -4,11 +4,12 @@ import ( bfpb "github.com/filecoin-project/mir/pkg/pb/batchfetcherpb" "github.com/filecoin-project/mir/pkg/pb/commonpb" "github.com/filecoin-project/mir/pkg/pb/eventpb" - "github.com/filecoin-project/mir/pkg/pb/requestpb" t "github.com/filecoin-project/mir/pkg/types" ) -// These are specific events that are not automatically generated but are necessary for the batchfetcher to queue them and treat them in order +// These are specific events that are not automatically generated but are necessary for the batchfetcher +// to queue them and treat them in order. + // Event creates an eventpb.Event out of an batchfetcherpb.Event. func Event(dest t.ModuleID, ev *bfpb.Event) *eventpb.Event { return &eventpb.Event{ @@ -19,18 +20,6 @@ func Event(dest t.ModuleID, ev *bfpb.Event) *eventpb.Event { } } -// NewOrderedBatch notifies the application when an ordered batch containing transaction payloads -// has been fetched from the availability layer and is ready for execution. -func NewOrderedBatch(dest t.ModuleID, txs []*requestpb.Request) *eventpb.Event { - return Event(dest, &bfpb.Event{ - Type: &bfpb.Event_NewOrderedBatch{ - NewOrderedBatch: &bfpb.NewOrderedBatch{ - Txs: txs, - }, - }, - }) -} - func ClientProgress(dest t.ModuleID, progress *commonpb.ClientProgress) *eventpb.Event { return Event(dest, &bfpb.Event{Type: &bfpb.Event_ClientProgress{ClientProgress: progress}}) }