瀏覽代碼

Rename Model.clusterConfig to Model.generateClusterConfig

Jakob Borg 10 年之前
父節點
當前提交
9cf653d673
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 4 3
      lib/model/model.go
  2. 1 1
      lib/model/model_test.go

+ 4 - 3
lib/model/model.go

@@ -956,7 +956,7 @@ func (m *Model) AddConnection(conn Connection) {
 
 
 	conn.Start()
 	conn.Start()
 
 
-	cm := m.clusterConfig(deviceID)
+	cm := m.generateClusterConfig(deviceID)
 	conn.ClusterConfig(cm)
 	conn.ClusterConfig(cm)
 
 
 	m.fmut.RLock()
 	m.fmut.RLock()
@@ -1476,8 +1476,9 @@ func (m *Model) numHashers(folder string) int {
 	return 1
 	return 1
 }
 }
 
 
-// clusterConfig returns a ClusterConfigMessage that is correct for the given peer device
-func (m *Model) clusterConfig(device protocol.DeviceID) protocol.ClusterConfigMessage {
+// generateClusterConfig returns a ClusterConfigMessage that is correct for
+// the given peer device
+func (m *Model) generateClusterConfig(device protocol.DeviceID) protocol.ClusterConfigMessage {
 	cm := protocol.ClusterConfigMessage{
 	cm := protocol.ClusterConfigMessage{
 		DeviceName:    m.deviceName,
 		DeviceName:    m.deviceName,
 		ClientName:    m.clientName,
 		ClientName:    m.clientName,

+ 1 - 1
lib/model/model_test.go

@@ -385,7 +385,7 @@ func TestClusterConfig(t *testing.T) {
 	m.AddFolder(cfg.Folders[1])
 	m.AddFolder(cfg.Folders[1])
 	m.ServeBackground()
 	m.ServeBackground()
 
 
-	cm := m.clusterConfig(device2)
+	cm := m.generateClusterConfig(device2)
 
 
 	if l := len(cm.Folders); l != 2 {
 	if l := len(cm.Folders); l != 2 {
 		t.Fatalf("Incorrect number of folders %d != 2", l)
 		t.Fatalf("Incorrect number of folders %d != 2", l)