diff --git a/cmd/mircat/debug.go b/cmd/mircat/debug.go index 90e066588..6d1d3c68a 100644 --- a/cmd/mircat/debug.go +++ b/cmd/mircat/debug.go @@ -89,7 +89,7 @@ func debug(args *arguments) error { // If the event was selected by the user for inspection, pause before submitting it to the node. // The processing continues after the user's interactive confirmation. - if selected(event, args.selectedEvents, args.selectedIssEvents) && + if selected(event, args.selectedEventNames, args.selectedIssEventNames) && index >= args.offset && (args.limit == 0 || index < args.offset+args.limit) { diff --git a/cmd/mircat/display.go b/cmd/mircat/display.go index 0b29e5df5..212ea1d43 100644 --- a/cmd/mircat/display.go +++ b/cmd/mircat/display.go @@ -40,13 +40,16 @@ func displayEvents(args *arguments) error { for _, event := range entry.Events { metadata.index = uint64(index) - if _, ok := args.selectedEvents[eventName(event)]; ok && index >= args.offset && (args.limit == 0 || index < args.offset+args.limit) { + _, validEvent := args.selectedEventNames[eventName(event)] + _, validDest := args.selectedEventDests[event.DestModule] + + if validEvent && validDest && index >= args.offset && (args.limit == 0 || index < args.offset+args.limit) { // If event type has been selected for displaying switch e := event.Type.(type) { case *eventpb.Event_Iss: // Only display selected sub-types of the ISS Event - if _, ok := args.selectedIssEvents[issEventName(e.Iss)]; ok { + if _, validIssEvent := args.selectedIssEventNames[issEventName(e.Iss)]; validIssEvent { displayEvent(event, metadata) } default: diff --git a/cmd/mircat/eventloader.go b/cmd/mircat/eventloader.go index f03e834b2..69b9977f4 100644 --- a/cmd/mircat/eventloader.go +++ b/cmd/mircat/eventloader.go @@ -22,11 +22,12 @@ type eventMetadata struct { index uint64 } -// Returns the list of event names present in the given eventlog file, +// Returns the list of event names and destinations present in the given eventlog file, // along with the total number of events present in the file. -func getEventList(file *os.File) (map[string]struct{}, map[string]struct{}, int, error) { +func getEventList(file *os.File) (map[string]struct{}, map[string]struct{}, map[string]struct{}, int, error) { events := make(map[string]struct{}) issEvents := make(map[string]struct{}) + eventDests := make(map[string]struct{}) defer func(file *os.File, offset int64, whence int) { _, _ = file.Seek(offset, whence) // resets the file offset for successive reading @@ -34,7 +35,7 @@ func getEventList(file *os.File) (map[string]struct{}, map[string]struct{}, int, reader, err := eventlog.NewReader(file) if err != nil { - return nil, nil, 0, err + return nil, nil, nil, 0, err } cnt := 0 // Counts the total number of events in the event log. @@ -48,6 +49,7 @@ func getEventList(file *os.File) (map[string]struct{}, map[string]struct{}, int, // Add the Event name to the set of known Events. events[eventName(event)] = struct{}{} + eventDests[event.DestModule] = struct{}{} switch e := event.Type.(type) { case *eventpb.Event_Iss: // For ISS Events, also add the type of the ISS event to a set of known ISS events. @@ -56,10 +58,10 @@ func getEventList(file *os.File) (map[string]struct{}, map[string]struct{}, int, } } if errors.Is(err, io.EOF) { - return events, issEvents, cnt, fmt.Errorf("failed reading event log: %w", err) + return events, issEvents, eventDests, cnt, fmt.Errorf("failed reading event log: %w", err) } - return events, issEvents, cnt, nil + return events, issEvents, eventDests, cnt, nil } // eventName returns a string name of an Event. diff --git a/cmd/mircat/main.go b/cmd/mircat/main.go index ed9732772..3086245c3 100644 --- a/cmd/mircat/main.go +++ b/cmd/mircat/main.go @@ -31,10 +31,13 @@ type arguments struct { limit int // Events selected by the user for displaying. - selectedEvents map[string]struct{} + selectedEventNames map[string]struct{} // If ISS Events have been selected for displaying, this variable contains the types of ISS events to be displayed. - selectedIssEvents map[string]struct{} + selectedIssEventNames map[string]struct{} + + // Events with specific destination modules selected by the user for displaying + selectedEventDests map[string]struct{} // If set to true, start a Node in debug mode with the given event log. debug bool @@ -64,7 +67,7 @@ func main() { // Scan the event log and collect all occurring event types. fmt.Println("Scanning input file.") - allEvents, allISSEvents, totalEvents, err := getEventList(args.srcFile) + allEvents, allISSEvents, allDests, totalEvents, err := getEventList(args.srcFile) if err != nil { kingpin.Errorf("Error parsing src file", err) fmt.Printf("\n\n!!!\nContinuing after error. Event list might be incomplete!\n!!!\n\n") @@ -73,23 +76,30 @@ func main() { // If no event types have been selected through command-line arguments, // have the user interactively select the events to include in the output. - if len(args.selectedEvents) == 0 { + if len(args.selectedEventNames) == 0 { // Select top-level events - args.selectedEvents = checkboxes("Please select the events", allEvents) + args.selectedEventNames = checkboxes("Please select the events", allEvents) // If any ISS events occur in the event log and the user selected the ISS event type, // have the user select which of those should be included in the output. - if _, ok := args.selectedEvents["Iss"]; ok { - args.selectedIssEvents = checkboxes("Please select the ISS events", allISSEvents) + if _, ok := args.selectedEventNames["Iss"]; ok { + args.selectedIssEventNames = checkboxes("Please select the ISS events", allISSEvents) } + } + + // // If no event destinations have been selected through command-line arguments, + // // have the user interactively select the event destinations' to include in the output. + if len(args.selectedEventDests) == 0 { + + // Select top-level events + args.selectedEventDests = checkboxes("Please select the event destinations", allDests) - // Print the command-line arguments representing the user's selection of events. - // This is useful for repeated runs of mircat. - fmt.Println("Command-line arguments for selecting the chosen events:\n" + - selectionArgs(args.selectedEvents, args.selectedIssEvents)) } + fmt.Println("Command-line arguments for selecting the chosen filters:\n" + + selectionArgs(args.selectedEventNames, args.selectedIssEventNames, args.selectedEventDests)) + // Display selected events or enter debug mode. if args.debug { err = debug(args) @@ -115,6 +125,7 @@ func parseArgs(args []string) (*arguments, error) { src := app.Flag("src", "The input file to read.").Required().File() events := app.Flag("event", "Event types to be displayed.").Short('e').Strings() issEvents := app.Flag("iss-event", "Types of ISS Events to be displayed if ISS events are selected.").Short('s').Strings() + eventDests := app.Flag("event-dest", "Event destination types to be displayed.").Short('r').Strings() offset := app.Flag("offset", "The first offset events will not be displayed.").Default("0").Int() limit := app.Flag("limit", "Maximum number of events to consider for display or debug").Default("0").Int() dbg := app.Flag("debug", "Start a Node in debug mode with the given event log.").Short('d').Bool() @@ -131,15 +142,16 @@ func parseArgs(args []string) (*arguments, error) { } return &arguments{ - srcFile: *src, - debug: *dbg, - ownID: t.NodeID(*id), - membership: t.NodeIDSlice(*membership), - showNodeEvents: *showNodeEvents, - offset: *offset, - limit: *limit, - selectedEvents: toSet(*events), - selectedIssEvents: toSet(*issEvents), + srcFile: *src, + debug: *dbg, + ownID: t.NodeID(*id), + membership: t.NodeIDSlice(*membership), + showNodeEvents: *showNodeEvents, + offset: *offset, + limit: *limit, + selectedEventNames: toSet(*events), + selectedIssEventNames: toSet(*issEvents), + selectedEventDests: toSet(*eventDests), }, nil } @@ -160,7 +172,7 @@ func checkboxes(label string, opts map[string]struct{}) map[string]struct{} { return toSet(selected) } -func selectionArgs(events map[string]struct{}, issEvents map[string]struct{}) string { +func selectionArgs(events map[string]struct{}, issEvents map[string]struct{}, dests map[string]struct{}) string { argStr := "" for _, eventName := range toList(events) { @@ -171,5 +183,9 @@ func selectionArgs(events map[string]struct{}, issEvents map[string]struct{}) st argStr += " --iss-event " + issEventName } + for _, dest := range toList(dests) { + argStr += " event-dest " + dest + } + return argStr } diff --git a/pkg/modules/mockmodules/internal/mock_internal/impl.mock.go b/pkg/modules/mockmodules/internal/mock_internal/impl.mock.go index 273734019..1ceedfc10 100644 --- a/pkg/modules/mockmodules/internal/mock_internal/impl.mock.go +++ b/pkg/modules/mockmodules/internal/mock_internal/impl.mock.go @@ -7,9 +7,10 @@ package mock_internal import ( reflect "reflect" + gomock "github.com/golang/mock/gomock" + events "github.com/filecoin-project/mir/pkg/events" eventpb "github.com/filecoin-project/mir/pkg/pb/eventpb" - gomock "github.com/golang/mock/gomock" ) // MockModuleImpl is a mock of ModuleImpl interface. diff --git a/pkg/net/grpc/grpctransport.pb.go b/pkg/net/grpc/grpctransport.pb.go index 4d1221563..5cd691ad4 100644 --- a/pkg/net/grpc/grpctransport.pb.go +++ b/pkg/net/grpc/grpctransport.pb.go @@ -12,11 +12,13 @@ package grpc import ( - messagepb "github.com/filecoin-project/mir/pkg/pb/messagepb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + + messagepb "github.com/filecoin-project/mir/pkg/pb/messagepb" ) const ( diff --git a/pkg/net/grpc/grpctransport_grpc.pb.go b/pkg/net/grpc/grpctransport_grpc.pb.go index ba59dbbbe..9740e0d71 100644 --- a/pkg/net/grpc/grpctransport_grpc.pb.go +++ b/pkg/net/grpc/grpctransport_grpc.pb.go @@ -4,6 +4,7 @@ package grpc import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/pb/availabilitypb/availabilitypb.pb.go b/pkg/pb/availabilitypb/availabilitypb.pb.go index 7b8a6e52b..bab73efba 100644 --- a/pkg/pb/availabilitypb/availabilitypb.pb.go +++ b/pkg/pb/availabilitypb/availabilitypb.pb.go @@ -7,15 +7,17 @@ package availabilitypb import ( + reflect "reflect" + sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + mscpb "github.com/filecoin-project/mir/pkg/pb/availabilitypb/mscpb" contextstorepb "github.com/filecoin-project/mir/pkg/pb/contextstorepb" dslpb "github.com/filecoin-project/mir/pkg/pb/dslpb" _ "github.com/filecoin-project/mir/pkg/pb/mir" requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/pb/availabilitypb/batchdbpb/batchdbpb.pb.go b/pkg/pb/availabilitypb/batchdbpb/batchdbpb.pb.go index 0169ad563..58a29f368 100644 --- a/pkg/pb/availabilitypb/batchdbpb/batchdbpb.pb.go +++ b/pkg/pb/availabilitypb/batchdbpb/batchdbpb.pb.go @@ -7,14 +7,16 @@ package batchdbpb import ( + reflect "reflect" + sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + contextstorepb "github.com/filecoin-project/mir/pkg/pb/contextstorepb" dslpb "github.com/filecoin-project/mir/pkg/pb/dslpb" _ "github.com/filecoin-project/mir/pkg/pb/mir" requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/pb/availabilitypb/mscpb/mscpb.pb.go b/pkg/pb/availabilitypb/mscpb/mscpb.pb.go index 5854f2302..489f76f34 100644 --- a/pkg/pb/availabilitypb/mscpb/mscpb.pb.go +++ b/pkg/pb/availabilitypb/mscpb/mscpb.pb.go @@ -7,12 +7,14 @@ package mscpb import ( - commonpb "github.com/filecoin-project/mir/pkg/pb/commonpb" - requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + + commonpb "github.com/filecoin-project/mir/pkg/pb/commonpb" + requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" ) const ( diff --git a/pkg/pb/batchfetcherpb/batchfetcherpb.pb.go b/pkg/pb/batchfetcherpb/batchfetcherpb.pb.go index ca8db48f2..7813c2574 100644 --- a/pkg/pb/batchfetcherpb/batchfetcherpb.pb.go +++ b/pkg/pb/batchfetcherpb/batchfetcherpb.pb.go @@ -7,13 +7,15 @@ package batchfetcherpb import ( + reflect "reflect" + sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + commonpb "github.com/filecoin-project/mir/pkg/pb/commonpb" _ "github.com/filecoin-project/mir/pkg/pb/mir" requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/pb/bcbpb/bcbpb.pb.go b/pkg/pb/bcbpb/bcbpb.pb.go index a8df4f30f..ab60e8ab1 100644 --- a/pkg/pb/bcbpb/bcbpb.pb.go +++ b/pkg/pb/bcbpb/bcbpb.pb.go @@ -7,11 +7,13 @@ package bcbpb import ( - _ "github.com/filecoin-project/mir/pkg/pb/mir" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + + _ "github.com/filecoin-project/mir/pkg/pb/mir" ) const ( diff --git a/pkg/pb/checkpointpb/checkpointpb.pb.go b/pkg/pb/checkpointpb/checkpointpb.pb.go index 4ad141415..1b5f46fa6 100644 --- a/pkg/pb/checkpointpb/checkpointpb.pb.go +++ b/pkg/pb/checkpointpb/checkpointpb.pb.go @@ -7,11 +7,13 @@ package checkpointpb import ( - commonpb "github.com/filecoin-project/mir/pkg/pb/commonpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + + commonpb "github.com/filecoin-project/mir/pkg/pb/commonpb" ) const ( diff --git a/pkg/pb/commonpb/commonpb.pb.go b/pkg/pb/commonpb/commonpb.pb.go index b28ea45a2..7cf0c4aba 100644 --- a/pkg/pb/commonpb/commonpb.pb.go +++ b/pkg/pb/commonpb/commonpb.pb.go @@ -7,10 +7,11 @@ package commonpb import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/pb/contextstorepb/contextstorepb.pb.go b/pkg/pb/contextstorepb/contextstorepb.pb.go index 67ee5b764..df4d0d784 100644 --- a/pkg/pb/contextstorepb/contextstorepb.pb.go +++ b/pkg/pb/contextstorepb/contextstorepb.pb.go @@ -7,10 +7,11 @@ package contextstorepb import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/pb/dslpb/dslpb.pb.go b/pkg/pb/dslpb/dslpb.pb.go index 9e6385478..e9445fe39 100644 --- a/pkg/pb/dslpb/dslpb.pb.go +++ b/pkg/pb/dslpb/dslpb.pb.go @@ -7,10 +7,11 @@ package dslpb import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/pb/eventpb/eventpb.pb.go b/pkg/pb/eventpb/eventpb.pb.go index ffb7d138d..890b52557 100644 --- a/pkg/pb/eventpb/eventpb.pb.go +++ b/pkg/pb/eventpb/eventpb.pb.go @@ -12,6 +12,13 @@ package eventpb import ( + reflect "reflect" + sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" + availabilitypb "github.com/filecoin-project/mir/pkg/pb/availabilitypb" batchdbpb "github.com/filecoin-project/mir/pkg/pb/availabilitypb/batchdbpb" batchfetcherpb "github.com/filecoin-project/mir/pkg/pb/batchfetcherpb" @@ -28,11 +35,6 @@ import ( pingpongpb "github.com/filecoin-project/mir/pkg/pb/pingpongpb" requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" threshcryptopb "github.com/filecoin-project/mir/pkg/pb/threshcryptopb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/pb/eventpb/eventpb.pb.mir.go b/pkg/pb/eventpb/eventpb.pb.mir.go index 6c7153a0b..316c1005c 100644 --- a/pkg/pb/eventpb/eventpb.pb.mir.go +++ b/pkg/pb/eventpb/eventpb.pb.mir.go @@ -1,6 +1,8 @@ package eventpb import ( + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" + availabilitypb "github.com/filecoin-project/mir/pkg/pb/availabilitypb" batchdbpb "github.com/filecoin-project/mir/pkg/pb/availabilitypb/batchdbpb" batchfetcherpb "github.com/filecoin-project/mir/pkg/pb/batchfetcherpb" @@ -11,7 +13,6 @@ import ( mempoolpb "github.com/filecoin-project/mir/pkg/pb/mempoolpb" pingpongpb "github.com/filecoin-project/mir/pkg/pb/pingpongpb" threshcryptopb "github.com/filecoin-project/mir/pkg/pb/threshcryptopb" - wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) type Event_Type = isEvent_Type diff --git a/pkg/pb/factorymodulepb/factorymodulepb.pb.go b/pkg/pb/factorymodulepb/factorymodulepb.pb.go index f722b38d8..f2bf6952c 100644 --- a/pkg/pb/factorymodulepb/factorymodulepb.pb.go +++ b/pkg/pb/factorymodulepb/factorymodulepb.pb.go @@ -7,12 +7,14 @@ package factorymodulepb import ( - mscpb "github.com/filecoin-project/mir/pkg/pb/availabilitypb/mscpb" - checkpointpb "github.com/filecoin-project/mir/pkg/pb/checkpointpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + + mscpb "github.com/filecoin-project/mir/pkg/pb/availabilitypb/mscpb" + checkpointpb "github.com/filecoin-project/mir/pkg/pb/checkpointpb" ) const ( diff --git a/pkg/pb/isspb/isspb.pb.go b/pkg/pb/isspb/isspb.pb.go index 9b03c13c6..1d3627e97 100644 --- a/pkg/pb/isspb/isspb.pb.go +++ b/pkg/pb/isspb/isspb.pb.go @@ -12,15 +12,17 @@ package isspb import ( + reflect "reflect" + sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + availabilitypb "github.com/filecoin-project/mir/pkg/pb/availabilitypb" checkpointpb "github.com/filecoin-project/mir/pkg/pb/checkpointpb" commonpb "github.com/filecoin-project/mir/pkg/pb/commonpb" isspbftpb "github.com/filecoin-project/mir/pkg/pb/isspbftpb" requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/pb/isspbftpb/isspbftpb.pb.go b/pkg/pb/isspbftpb/isspbftpb.pb.go index cd6d404a7..43b482760 100644 --- a/pkg/pb/isspbftpb/isspbftpb.pb.go +++ b/pkg/pb/isspbftpb/isspbftpb.pb.go @@ -12,10 +12,11 @@ package isspbftpb import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/pb/mempoolpb/mempoolpb.pb.go b/pkg/pb/mempoolpb/mempoolpb.pb.go index 6e76c0a13..2a4b4e113 100644 --- a/pkg/pb/mempoolpb/mempoolpb.pb.go +++ b/pkg/pb/mempoolpb/mempoolpb.pb.go @@ -7,14 +7,16 @@ package mempoolpb import ( + reflect "reflect" + sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + contextstorepb "github.com/filecoin-project/mir/pkg/pb/contextstorepb" dslpb "github.com/filecoin-project/mir/pkg/pb/dslpb" _ "github.com/filecoin-project/mir/pkg/pb/mir" requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/pb/messagepb/messagepb.pb.go b/pkg/pb/messagepb/messagepb.pb.go index cc6897d87..a26494c44 100644 --- a/pkg/pb/messagepb/messagepb.pb.go +++ b/pkg/pb/messagepb/messagepb.pb.go @@ -12,15 +12,17 @@ package messagepb import ( + reflect "reflect" + sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + mscpb "github.com/filecoin-project/mir/pkg/pb/availabilitypb/mscpb" bcbpb "github.com/filecoin-project/mir/pkg/pb/bcbpb" checkpointpb "github.com/filecoin-project/mir/pkg/pb/checkpointpb" isspb "github.com/filecoin-project/mir/pkg/pb/isspb" pingpongpb "github.com/filecoin-project/mir/pkg/pb/pingpongpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/pb/mir/plugin.pb.go b/pkg/pb/mir/plugin.pb.go index ba9d0bdf6..956773f75 100644 --- a/pkg/pb/mir/plugin.pb.go +++ b/pkg/pb/mir/plugin.pb.go @@ -7,10 +7,11 @@ package mir import ( + reflect "reflect" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" descriptorpb "google.golang.org/protobuf/types/descriptorpb" - reflect "reflect" ) const ( diff --git a/pkg/pb/pingpongpb/pingpongpb.pb.go b/pkg/pb/pingpongpb/pingpongpb.pb.go index c5570ae27..eae73c3b4 100644 --- a/pkg/pb/pingpongpb/pingpongpb.pb.go +++ b/pkg/pb/pingpongpb/pingpongpb.pb.go @@ -7,10 +7,11 @@ package pingpongpb import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/pb/recordingpb/recordingpb.pb.go b/pkg/pb/recordingpb/recordingpb.pb.go index 2585b98fa..a227c43ee 100644 --- a/pkg/pb/recordingpb/recordingpb.pb.go +++ b/pkg/pb/recordingpb/recordingpb.pb.go @@ -12,11 +12,13 @@ package recordingpb import ( - eventpb "github.com/filecoin-project/mir/pkg/pb/eventpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + + eventpb "github.com/filecoin-project/mir/pkg/pb/eventpb" ) const ( diff --git a/pkg/pb/requestpb/requestpb.pb.go b/pkg/pb/requestpb/requestpb.pb.go index 81bf3a771..d7353c4b0 100644 --- a/pkg/pb/requestpb/requestpb.pb.go +++ b/pkg/pb/requestpb/requestpb.pb.go @@ -12,10 +12,11 @@ package requestpb import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pkg/pb/threshcryptopb/threshcryptopb.pb.go b/pkg/pb/threshcryptopb/threshcryptopb.pb.go index 0dd7029e3..0c2999e17 100644 --- a/pkg/pb/threshcryptopb/threshcryptopb.pb.go +++ b/pkg/pb/threshcryptopb/threshcryptopb.pb.go @@ -7,13 +7,15 @@ package threshcryptopb import ( + reflect "reflect" + sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + contextstorepb "github.com/filecoin-project/mir/pkg/pb/contextstorepb" dslpb "github.com/filecoin-project/mir/pkg/pb/dslpb" _ "github.com/filecoin-project/mir/pkg/pb/mir" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/requestreceiver/requestreceiver.pb.go b/pkg/requestreceiver/requestreceiver.pb.go index 054edb497..53a9e244f 100644 --- a/pkg/requestreceiver/requestreceiver.pb.go +++ b/pkg/requestreceiver/requestreceiver.pb.go @@ -12,11 +12,13 @@ package requestreceiver import ( - requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + + requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" ) const ( diff --git a/pkg/requestreceiver/requestreceiver_grpc.pb.go b/pkg/requestreceiver/requestreceiver_grpc.pb.go index 0238409ab..0277122b9 100644 --- a/pkg/requestreceiver/requestreceiver_grpc.pb.go +++ b/pkg/requestreceiver/requestreceiver_grpc.pb.go @@ -4,10 +4,12 @@ package requestreceiver import ( context "context" - requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + + requestpb "github.com/filecoin-project/mir/pkg/pb/requestpb" ) // This is a compile-time assertion to ensure that this generated file diff --git a/pkg/simplewal/simplewal.pb.go b/pkg/simplewal/simplewal.pb.go index 1effadda6..6ed52eb38 100644 --- a/pkg/simplewal/simplewal.pb.go +++ b/pkg/simplewal/simplewal.pb.go @@ -12,11 +12,13 @@ package simplewal import ( - eventpb "github.com/filecoin-project/mir/pkg/pb/eventpb" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + + eventpb "github.com/filecoin-project/mir/pkg/pb/eventpb" ) const ( diff --git a/samples/chat-demo/chatdemo.pb.go b/samples/chat-demo/chatdemo.pb.go index 7b35509dc..fc15ef91a 100644 --- a/samples/chat-demo/chatdemo.pb.go +++ b/samples/chat-demo/chatdemo.pb.go @@ -12,10 +12,11 @@ package main import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const (