From 2031345c86cf1457650e0842e77a5401215f7484 Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Thu, 5 Jul 2018 21:48:59 -0500 Subject: [PATCH] Unexport NewTopology --- cluster.go | 6 +++--- utils_internal_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster.go b/cluster.go index 226221b99..647db4f24 100644 --- a/cluster.go +++ b/cluster.go @@ -1403,7 +1403,7 @@ type Topology struct { nodeStates map[string]string } -func NewTopology() *Topology { +func newTopology() *Topology { return &Topology{ nodeStates: make(map[string]string), } @@ -1472,7 +1472,7 @@ func (t *Topology) Encode() *internal.Topology { func (c *cluster) loadTopology() error { buf, err := ioutil.ReadFile(filepath.Join(c.Path, ".topology")) if os.IsNotExist(err) { - c.Topology = NewTopology() + c.Topology = newTopology() return nil } else if err != nil { return errors.Wrap(err, "reading file") @@ -1784,7 +1784,7 @@ func decodeTopology(topology *internal.Topology) (*Topology, error) { return nil, nil } - t := NewTopology() + t := newTopology() t.ClusterID = topology.ClusterID t.NodeIDs = topology.NodeIDs sort.Slice(t.NodeIDs, diff --git a/utils_internal_test.go b/utils_internal_test.go index 7adb110e8..baaac04e3 100644 --- a/utils_internal_test.go +++ b/utils_internal_test.go @@ -37,7 +37,7 @@ func NewTestCluster(n int) *cluster { c.ReplicaN = 1 c.Hasher = NewTestModHasher() c.Path = path - c.Topology = NewTopology() + c.Topology = newTopology() for i := 0; i < n; i++ { c.Nodes = append(c.Nodes, &Node{ @@ -225,7 +225,7 @@ func (t *ClusterCluster) addCluster(i int, saveTopology bool) (*cluster, error) c.ReplicaN = 1 c.Hasher = NewTestModHasher() c.Path = path - c.Topology = NewTopology() + c.Topology = newTopology() c.holder = h c.Node = node c.Coordinator = t.common.Nodes[0].ID // the first node is the coordinator