Generalize Modules to 2 types: ActiveModule and PassiveModule

cmd/mircat/debug.go

@@ -120,13 +120,13 @@ func debuggerNode(id t.NodeID, membership []t.NodeID) (*mir.Node, error) {
 	reqStore := reqstore.NewVolatileRequestStore()
 
 	// Instantiate and return a minimal Mir Node.
-	node, err := mir.NewNode(id, &mir.NodeConfig{Logger: logger}, &modules.Modules{
-		Net:          &nullNet{},
-		Crypto:       &mirCrypto.DummyCrypto{DummySig: []byte{0}},
-		App:          &deploytest.FakeApp{ReqStore: reqStore},
-		RequestStore: reqStore,
-		Protocol:     protocol,
-	})
+	node, err := mir.NewNode(id, &mir.NodeConfig{Logger: logger}, map[t.ModuleID]modules.Module{
+		"net":      modules.NullActive{},
+		"crypto":   mirCrypto.New(&mirCrypto.DummyCrypto{DummySig: []byte{0}}),
+		"app":      &deploytest.FakeApp{ReqStore: reqStore},
+		"reqStore": reqStore,
+		"iss":      protocol,
+	}, nil)
 	if err != nil {
 		return nil, fmt.Errorf("could not instantiate mir node: %w", err)
 	}

mir_test.go

@@ -47,8 +47,8 @@ var _ = Describe("Basic test", func() {
 		// The deployment used by the test.
 		deployment *deploytest.Deployment
 
-		// When the deployment stops, the final node statuses will be written here.
-		finalStatuses []deploytest.NodeStatus
+		// When the deployment stops, the errors returned by the nodes will be written here.
+		nodeErrors []error
 
 		heapObjects int64
 		heapAlloc   int64
@@ -58,7 +58,7 @@ var _ = Describe("Basic test", func() {
 
 	// Before each run, clear the test state variables.
 	BeforeEach(func() {
-		finalStatuses = nil
+		nodeErrors = nil
 		ctx = context.Background()
 	})
 
@@ -90,17 +90,16 @@ var _ = Describe("Basic test", func() {
 			}()
 		}
 
-		// Run deployment until it stops and returns final node statuses.
-		finalStatuses, heapObjects, heapAlloc = deployment.Run(ctx)
+		// Run deployment until it stops and returns final node errors.
+		nodeErrors, heapObjects, heapAlloc = deployment.Run(ctx)
 		fmt.Printf("Deployment run returned.")
 
 		// Check whether all the test replicas exited correctly.
-		Expect(finalStatuses).NotTo(BeNil())
-		for _, status := range finalStatuses {
-			if status.ExitErr != mir.ErrStopped {
-				Expect(status.ExitErr).NotTo(HaveOccurred())
+		Expect(nodeErrors).NotTo(BeNil())
+		for _, err := range nodeErrors {
+			if err != mir.ErrStopped {
+				Expect(err).NotTo(HaveOccurred())
 			}
-			Expect(status.StatusErr).NotTo(HaveOccurred())
 		}
 
 		// Check if all requests were delivered.
@@ -127,28 +126,17 @@ var _ = Describe("Basic test", func() {
 			}
 
 			// Print final status of the system.
-			fmt.Printf("\n\nPrinting status because of failed test in %s\n",
-				CurrentGinkgoTestDescription().TestText)
+			fmt.Printf("\n\nPrinting errors because of failed test in %s\n", CurrentSpecReport().FullText())
 
-			for nodeIndex, nodeStatus := range finalStatuses {
+			for nodeIndex, err := range nodeErrors {
 				fmt.Printf("\nStatus for node %d\n", nodeIndex)
 
 				// ErrStopped indicates normal termination.
 				// If another error is detected, print it.
-				if nodeStatus.ExitErr == mir.ErrStopped {
+				if err == mir.ErrStopped {
 					fmt.Printf("\nStopped normally\n")
 				} else {
-					fmt.Printf("\nStopped with error: %+v\n", nodeStatus.ExitErr)
-				}
-
-				// Print node status if available.
-				if nodeStatus.StatusErr != nil {
-					// If node status could not be obtained, print the associated error.
-					fmt.Printf("Could not obtain final status of node %d: %v", nodeIndex, nodeStatus.StatusErr)
-				} else {
-					// Otherwise, print the status.
-					// TODO: print the status in a readable form.
-					fmt.Printf("%v\n", nodeStatus.Status)
+					fmt.Printf("\nStopped with error: %+v\n", err)
 				}
 			}
 		}
@@ -198,7 +186,7 @@ var _ = Describe("Basic test", func() {
 			Transport:             "fake",
 			NumFakeRequests:       100,
 			Directory:             "",
-			Duration:              8 * time.Second,
+			Duration:              10 * time.Second,
 			FirstReplicaISSConfig: slowProposeConfig,
 		}),
 		Entry("Submits 10 fake requests with 4 nodes and actual networking", &deploytest.TestConfig{