Generics

async.go

@@ -44,21 +44,21 @@ type asyncCallState struct {
 // AsyncCall starts an asynchronous quorum call, returning an Async object that can be used to retrieve the results.
 //
 // This function should only be used by generated code.
-func (c RawConfiguration) AsyncCall(ctx context.Context, d QuorumCallData) *Async {
-	expectedReplies := len(c)
+func (c RawConfiguration[NODE, QSPEC]) AsyncCall(ctx context.Context, d QuorumCallData) *Async {
+	expectedReplies := len(c.nodes)
 	md := &ordering.Metadata{MessageID: c.getMsgID(), Method: d.Method}
 	replyChan := make(chan response, expectedReplies)
 
-	for _, n := range c {
+	for _, n := range c.nodes {
 		msg := d.Message
 		if d.PerNodeArgFn != nil {
-			msg = d.PerNodeArgFn(d.Message, n.id)
+			msg = d.PerNodeArgFn(d.Message, n.AsRaw().id)
 			if !msg.ProtoReflect().IsValid() {
 				expectedReplies--
 				continue // don't send if no msg
 			}
 		}
-		n.channel.enqueue(request{ctx: ctx, msg: &Message{Metadata: md, Message: msg}}, replyChan, false)
+		n.AsRaw().channel.enqueue(request{ctx: ctx, msg: &Message{Metadata: md, Message: msg}}, replyChan, false)
 	}
 
 	fut := &Async{c: make(chan struct{}, 1)}
@@ -73,7 +73,7 @@ func (c RawConfiguration) AsyncCall(ctx context.Context, d QuorumCallData) *Asyn
 	return fut
 }
 
-func (c RawConfiguration) handleAsyncCall(ctx context.Context, fut *Async, state asyncCallState) {
+func (c RawConfiguration[NODE, QSPEC]) handleAsyncCall(ctx context.Context, fut *Async, state asyncCallState) {
 	defer close(fut.c)
 
 	var (

benchmark/benchmark.go

@@ -37,7 +37,7 @@ type (
 	serverFunc  func(context.Context, *TimedMsg)
 )
 
-func runQCBenchmark(opts Options, cfg *Configuration, f qcFunc) (*Result, error) {
+func runQCBenchmark(opts Options, cfg Configuration, f qcFunc) (*Result, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	msg := &Echo{Payload: make([]byte, opts.Payload)}
@@ -103,7 +103,7 @@ func runQCBenchmark(opts Options, cfg *Configuration, f qcFunc) (*Result, error)
 	return result, nil
 }
 
-func runAsyncQCBenchmark(opts Options, cfg *Configuration, f asyncQCFunc) (*Result, error) {
+func runAsyncQCBenchmark(opts Options, cfg Configuration, f asyncQCFunc) (*Result, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	msg := &Echo{Payload: make([]byte, opts.Payload)}
@@ -187,7 +187,7 @@ func runAsyncQCBenchmark(opts Options, cfg *Configuration, f asyncQCFunc) (*Resu
 	return result, nil
 }
 
-func runServerBenchmark(opts Options, cfg *Configuration, f serverFunc) (*Result, error) {
+func runServerBenchmark(opts Options, cfg Configuration, f serverFunc) (*Result, error) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	payload := make([]byte, opts.Payload)
@@ -241,7 +241,7 @@ func runServerBenchmark(opts Options, cfg *Configuration, f serverFunc) (*Result
 }
 
 // GetBenchmarks returns a list of Benchmarks that can be performed on the configuration
-func GetBenchmarks(cfg *Configuration) []Bench {
+func GetBenchmarks(cfg Configuration) []Bench {
 	m := []Bench{
 		{
 			Name:        "QuorumCall",
@@ -270,7 +270,7 @@ func GetBenchmarks(cfg *Configuration) []Bench {
 }
 
 // RunBenchmarks runs all the benchmarks that match the given regex with the given options
-func RunBenchmarks(benchRegex *regexp.Regexp, options Options, cfg *Configuration) ([]*Result, error) {
+func RunBenchmarks(benchRegex *regexp.Regexp, options Options, cfg Configuration) ([]*Result, error) {
 	benchmarks := GetBenchmarks(cfg)
 	var results []*Result
 	for _, b := range benchmarks {

cmd/benchmark/main.go

@@ -58,7 +58,7 @@ func (f *listFlag) Get() []string {
 
 func listBenchmarks() {
 	tw := tabwriter.NewWriter(os.Stdout, 0, 0, 4, ' ', 0)
-	benchmarks := benchmark.GetBenchmarks(nil)
+	benchmarks := benchmark.GetBenchmarks(benchmark.Configuration{})
 	for _, b := range benchmarks {
 		fmt.Fprintf(tw, "%s:\t%s\n", b.Name, b.Description)
 	}