feat: add WithNodes function NodeID-to-StructMapping

Author: meling

config_opts.go

@@ -11,6 +11,44 @@ type NodeListOption interface {
 	newConfig(*Manager) (Configuration, error)
 }
 
+// NodeAddress must be implemented by types that can be used as node addresses.
+type NodeAddress interface {
+	Addr() string
+}
+
+type structNodeMap[T NodeAddress] struct {
+	nodes map[uint32]T
+}
+
+func (structNodeMap[T]) isOption() {}
+
+func (o structNodeMap[T]) newConfig(mgr *Manager) (nodes Configuration, err error) {
+	if len(o.nodes) == 0 {
+		return nil, fmt.Errorf("config: missing required node map")
+	}
+	nodes = make(Configuration, 0, len(o.nodes))
+	for id, n := range o.nodes {
+		node, found := mgr.Node(id)
+		if !found {
+			node, err = mgr.newNode(n.Addr(), id)
+			if err != nil {
+				return nil, err
+			}
+		}
+		nodes = append(nodes, node)
+	}
+	// Sort nodes to ensure deterministic iteration.
+	OrderedBy(ID).Sort(mgr.nodes)
+	OrderedBy(ID).Sort(nodes)
+	return nodes, nil
+}
+
+// WithNodes returns a NodeListOption containing the provided
+// mapping from application-specific IDs to types implementing NodeAddress.
+func WithNodes[T NodeAddress](nodes map[uint32]T) NodeListOption {
+	return &structNodeMap[T]{nodes: nodes}
+}
+
 type nodeIDMap struct {
 	idMap map[string]uint32
 }

config_test.go

@@ -101,6 +101,47 @@ func TestNewConfigurationNodeMap(t *testing.T) {
 	}
 }
 
+type testNode struct {
+	addr string
+}
+
+func (n testNode) Addr() string {
+	return n.addr
+}
+
+func TestNewConfigurationWithNodes(t *testing.T) {
+	mgr := gorums.NewManager(gorums.InsecureDialOptions(t))
+	t.Cleanup(gorums.Closer(t, mgr))
+
+	nodes := map[uint32]testNode{
+		1: {addr: "127.0.0.1:9080"},
+		2: {addr: "127.0.0.1:9081"},
+		3: {addr: "127.0.0.1:9082"},
+		4: {addr: "127.0.0.1:9083"},
+	}
+
+	cfg, err := gorums.NewConfiguration(mgr, gorums.WithNodes(nodes))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cfg.Size() != len(nodes) {
+		t.Errorf("cfg.Size() = %d, expected %d", cfg.Size(), len(nodes))
+	}
+	for _, node := range cfg.Nodes() {
+		if nodes[node.ID()].addr != node.Address() {
+			t.Errorf("cfg.Nodes()[%d] = %s, expected %s", node.ID(), node.Address(), nodes[node.ID()].addr)
+		}
+	}
+	if mgr.Size() != len(nodes) {
+		t.Errorf("mgr.Size() = %d, expected %d", mgr.Size(), len(nodes))
+	}
+	for _, node := range mgr.Nodes() {
+		if nodes[node.ID()].addr != node.Address() {
+			t.Errorf("mgr.Nodes()[%d] = %s, expected %s", node.ID(), node.Address(), nodes[node.ID()].addr)
+		}
+	}
+}
+
 func TestNewConfigurationNodeIDs(t *testing.T) {
 	mgr := gorums.NewManager(gorums.InsecureDialOptions(t))
 	t.Cleanup(gorums.Closer(t, mgr))