Merge branch 'master' into connection

.vscode/gorums.txt

@@ -43,6 +43,7 @@ Meland's
 Meling
 memprofile
 multicast
+naddr
 obj's
 Paxos
 Pedersen
@@ -53,6 +54,8 @@ protoc
 protogen
 protoimpl
 protoreflect
+protoregistry
+protowire
 ptypes
 QCQF
 qcresult
@@ -78,6 +81,7 @@ unicast
 unmarshal
 unmarshaled
 unmarshaling
+unmarshals
 userguide
 Xeon
 Zorums

async.go

@@ -78,7 +78,7 @@ func (c RawConfiguration) handleAsyncCall(ctx context.Context, fut *Async, state
 
 	var (
 		resp    protoreflect.ProtoMessage
-		errs    []Error
+		errs    []nodeError
 		quorum  bool
 		replies = make(map[uint32]protoreflect.ProtoMessage)
 	)
@@ -87,7 +87,7 @@ func (c RawConfiguration) handleAsyncCall(ctx context.Context, fut *Async, state
 		select {
 		case r := <-state.replyChan:
 			if r.err != nil {
-				errs = append(errs, Error{r.nid, r.err})
+				errs = append(errs, nodeError{nodeID: r.nid, cause: r.err})
 				break
 			}
 			replies[r.nid] = r.msg
@@ -96,11 +96,11 @@ func (c RawConfiguration) handleAsyncCall(ctx context.Context, fut *Async, state
 				return
 			}
 		case <-ctx.Done():
-			fut.reply, fut.err = resp, QuorumCallError{ctx.Err().Error(), len(replies), errs}
+			fut.reply, fut.err = resp, QuorumCallError{cause: ctx.Err(), errors: errs, replies: len(replies)}
 			return
 		}
 		if len(errs)+len(replies) == state.expectedReplies {
-			fut.reply, fut.err = resp, QuorumCallError{"incomplete call", len(replies), errs}
+			fut.reply, fut.err = resp, QuorumCallError{cause: Incomplete, errors: errs, replies: len(replies)}
 			return
 		}
 	}

cmd/protoc-gen-gorums/dev/mgr.go

@@ -37,7 +37,7 @@ func NewManager(opts ...gorums.ManagerOption) (mgr *Manager) {
 // using the And, WithNewNodes, Except, and WithoutNodes methods.
 func (m *Manager) NewConfiguration(opts ...gorums.ConfigOption) (c *Configuration, err error) {
 	if len(opts) < 1 || len(opts) > 2 {
-		return nil, fmt.Errorf("wrong number of options: %d", len(opts))
+		return nil, fmt.Errorf("config: wrong number of options: %d", len(opts))
 	}
 	c = &Configuration{}
 	for _, opt := range opts {
@@ -51,13 +51,13 @@ func (m *Manager) NewConfiguration(opts ...gorums.ConfigOption) (c *Configuratio
 			// Must be last since v may match QuorumSpec if it is interface{}
 			c.qspec = v
 		default:
-			return nil, fmt.Errorf("unknown option type: %v", v)
+			return nil, fmt.Errorf("config: unknown option type: %v", v)
 		}
 	}
 	// return an error if the QuorumSpec interface is not empty and no implementation was provided.
 	var test interface{} = struct{}{}
 	if _, empty := test.(QuorumSpec); !empty && c.qspec == nil {
-		return nil, fmt.Errorf("missing required QuorumSpec")
+		return nil, fmt.Errorf("config: missing required QuorumSpec")
 	}
 	return c, nil
 }