Parametrize availability layer sub-certificate limit

The limit on the number of sub-certificates is not hard-coded to 5 any more,
but is a proper parameter of the Trantor system.

Some tests were designed before the code was even generalized to support
more than one sub-certificate (the limit effectively being 1) and stopped
working after the code supported 5 sub-certificates by default.
Tests that should have failed were passing due to this.

This test makes this limit a proper parameter that can be higher by default,
but still set to 1 in tests.

Details:
* Remove obsolete Certs field from MSC params
* Use parameter template for availability module
* Remove unused field in dynamic availability params
* Re-generate protobufs
* Set default subcert limit to 5, but test with 1

Signed-off-by: Matej Pavlovic <[email protected]>

pkg/availability/multisigcollector/common/common.go

@@ -2,7 +2,6 @@ package common
 
 import (
 	msctypes "github.com/filecoin-project/mir/pkg/availability/multisigcollector/types"
-	mscpbtypes "github.com/filecoin-project/mir/pkg/pb/availabilitypb/mscpb/types"
 	cryptopbtypes "github.com/filecoin-project/mir/pkg/pb/cryptopb/types"
 	trantorpbtypes "github.com/filecoin-project/mir/pkg/pb/trantorpb/types"
 	t "github.com/filecoin-project/mir/pkg/types"
@@ -32,7 +31,6 @@ type ModuleConfig struct {
 type ModuleParams struct {
 	InstanceUID []byte                     // unique identifier for this instance used to prevent replay attacks
 	Membership  *trantorpbtypes.Membership // the list of participating nodes
-	Certs       []*mscpbtypes.Cert         // the list of generated certificates
 	Limit       int                        // the maximum number of certificates to generate before a request is completed
 	MaxRequests int                        // the maximum number of requests to be provided by this module
 }

pkg/availability/multisigcollector/multisigcollector.go

@@ -1,6 +1,8 @@
 package multisigcollector
 
 import (
+	"math"
+
 	"github.com/filecoin-project/mir/pkg/availability/multisigcollector/internal/parts/batchreconstruction"
 	"github.com/filecoin-project/mir/pkg/availability/multisigcollector/internal/parts/certcreation"
 	"github.com/filecoin-project/mir/pkg/availability/multisigcollector/internal/parts/certverification"
@@ -21,6 +23,16 @@ type ModuleConfig = common.ModuleConfig
 // All replicas are expected to use identical module parameters.
 type ModuleParams = common.ModuleParams
 
+// DefaultParamsTemplate returns the availability module parameters structure partially filled with default values.
+// Fields without a meaningful default value (like InstanceUID and Membership)
+// are left empty (zero values for their corresponding type).
+func DefaultParamsTemplate() ModuleParams {
+	return ModuleParams{
+		Limit:       5,           // Number of sub-certificates in one availability certificate.
+		MaxRequests: math.MaxInt, // By default, have the availability module run (basically) forever.
+	}
+}
+
 // NewModule creates a new instance of the multisig collector module.
 // Multisig collector is the simplest implementation of the availability layer.
 // Whenever an availability certificate is requested, it pulls a batch from the mempool module,
@@ -35,7 +47,7 @@ func NewModule(mc ModuleConfig, params *ModuleParams, logger logging.Logger) (mo
 	return m, nil
 }
 
-func NewReconfigurableModule(mc ModuleConfig, logger logging.Logger) modules.PassiveModule {
+func NewReconfigurableModule(mc ModuleConfig, paramsTemplate ModuleParams, logger logging.Logger) modules.PassiveModule {
 	if logger == nil {
 		logger = logging.ConsoleErrorLogger
 	}
@@ -54,17 +66,18 @@ func NewReconfigurableModule(mc ModuleConfig, logger logging.Logger) modules.Pas
 				submc := mc
 				submc.Self = mscID
 
+				// Fill in instance-specific parameters.
+				moduleParams := paramsTemplate
+				moduleParams.InstanceUID = []byte(mscID)
+				moduleParams.Membership = mscParams.Membership
+				moduleParams.MaxRequests = int(mscParams.MaxRequests)
+				// TODO: Use InstanceUIDs properly.
+				//       (E.g., concatenate this with the instantiating protocol's InstanceUID when introduced.)
+
 				// Create a new instance of the multisig collector.
 				multisigCollector, err := NewModule(
 					submc,
-					&ModuleParams{
-						// TODO: Use InstanceUIDs properly.
-						//       (E.g., concatenate this with the instantiating protocol's InstanceUID when introduced.)
-						InstanceUID: []byte(mscID),
-						Membership:  mscParams.Membership,
-						Limit:       int(mscParams.Limit),
-						MaxRequests: int(mscParams.MaxRequests),
-					},
+					&moduleParams,
 					logger,
 				)
 				if err != nil {

pkg/iss/iss.go

@@ -624,7 +624,6 @@ func (iss *ISS) initAvailability() {
 			Type: &factorypbtypes.GeneratorParams_MultisigCollector{
 				MultisigCollector: &mscpbtypes.InstanceParams{
 					Membership:  iss.memberships[0],
-					Limit:       5, // hardcoded right now
 					MaxRequests: uint64(iss.Params.SegmentLength)},
 			},
 		},