De-ISS-ize RequestReceiver

Remove hardcoded dependencies of RequestReceiver on ISS.

pkg/deploytest/testreplica.go

@@ -126,7 +126,7 @@ func (tr *TestReplica) Run(ctx context.Context) error {
 	}
 
 	// Create a RequestReceiver for request coming over the network.
-	requestReceiver := requestreceiver.NewRequestReceiver(node, logging.Decorate(tr.Config.Logger, "ReqRec: "))
+	requestReceiver := requestreceiver.NewRequestReceiver(node, "iss", logging.Decorate(tr.Config.Logger, "ReqRec: "))
 	p, err := strconv.Atoi(tr.ID.Pb())
 	if err != nil {
 		return fmt.Errorf("error converting node ID %s: %w", tr.ID, err)

pkg/requestreceiver/requestreceiver.go

@@ -19,6 +19,7 @@ import (
 	"github.com/filecoin-project/mir/pkg/events"
 	"github.com/filecoin-project/mir/pkg/logging"
 	"github.com/filecoin-project/mir/pkg/pb/requestpb"
+	t "github.com/filecoin-project/mir/pkg/types"
 )
 
 type RequestReceiver struct {
@@ -27,6 +28,9 @@ type RequestReceiver struct {
 	// The Node to which to submit the received requests.
 	node *mir.Node
 
+	// The ID of the module to which to submit the received requests.
+	moduleID t.ModuleID
+
 	// The gRPC server used by this networking module.
 	grpcServer *grpc.Server
 
@@ -45,15 +49,16 @@ type RequestReceiver struct {
 // The returned RequestReceiver is not yet running (able to receive requests).
 // This needs to be done explicitly by calling the Start() method.
 // For the requests to be processed by passed Node, the Node must also be running.
-func NewRequestReceiver(node *mir.Node, logger logging.Logger) *RequestReceiver {
+func NewRequestReceiver(node *mir.Node, moduleID t.ModuleID, logger logging.Logger) *RequestReceiver {
 	// If no logger was given, only write errors to the console.
 	if logger == nil {
 		logger = logging.ConsoleErrorLogger
 	}
 
 	return &RequestReceiver{
-		node:   node,
-		logger: logger,
+		node:     node,
+		moduleID: moduleID,
+		logger:   logger,
 	}
 }
 
@@ -83,7 +88,7 @@ func (rr *RequestReceiver) Listen(srv RequestReceiver_ListenServer) error {
 
 		// Submit the request to the Node.
 		if srErr := rr.node.InjectEvents(srv.Context(), events.ListOf(events.NewClientRequests(
-			"iss",
+			rr.moduleID,
 			[]*requestpb.Request{req},
 		))); srErr != nil {
 

samples/chat-demo/main.go

@@ -212,7 +212,7 @@ func run() error {
 	// Create a request receiver and start receiving requests.
 	// Note that the RequestReceiver is _not_ part of the Node as its module.
 	// It is external to the Node and only submits requests it receives to the node.
-	reqReceiver := requestreceiver.NewRequestReceiver(node, logger)
+	reqReceiver := requestreceiver.NewRequestReceiver(node, "iss", logger)
 	if err := reqReceiver.Start(reqReceiverBasePort + ownID); err != nil {
 		return fmt.Errorf("could not start request receiver: %w", err)
 	}