settings: fix validation logic

SiaFoundation · Aug 17, 2024 · cfceecd · cfceecd
1 parent 75a99a6
commit cfceecd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/host/settings/announce_test.go b/host/settings/announce_test.go
@@ -40,7 +40,7 @@ func TestAutoAnnounce(t *testing.T) {
 	}
 	defer contracts.Close()
 
-	sm, err := settings.NewConfigManager(hostKey, node.Store, node.Chain, node.Syncer, wm, settings.WithLog(log.Named("settings")), settings.WithAnnounceInterval(50))
+	sm, err := settings.NewConfigManager(hostKey, node.Store, node.Chain, node.Syncer, wm, settings.WithLog(log.Named("settings")), settings.WithAnnounceInterval(50), settings.WithValidateNetAddress(false))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/host/settings/settings.go b/host/settings/settings.go
@@ -226,11 +226,9 @@ func (m *ConfigManager) UpdateSettings(s Settings) error {
 	}
 
 	// if a netaddress is set, validate it
-	if strings.TrimSpace(s.NetAddress) != "" {
+	if strings.TrimSpace(s.NetAddress) != "" && m.validateNetAddress {
 		if err := validateNetAddress(s.NetAddress); err != nil {
-			if m.validateNetAddress {
-				return fmt.Errorf("failed to validate net address: %w", err)
-			}
+			return fmt.Errorf("failed to validate net address: %w", err)
 		}
 	}
 

diff --git a/host/settings/settings_test.go b/host/settings/settings_test.go
@@ -41,7 +41,7 @@ func TestSettings(t *testing.T) {
 	}
 	defer contracts.Close()
 
-	sm, err := settings.NewConfigManager(hostKey, node.Store, node.Chain, node.Syncer, wm, settings.WithLog(log.Named("settings")), settings.WithAnnounceInterval(50))
+	sm, err := settings.NewConfigManager(hostKey, node.Store, node.Chain, node.Syncer, wm, settings.WithLog(log.Named("settings")), settings.WithAnnounceInterval(50), settings.WithValidateNetAddress(false))
 	if err != nil {
 		t.Fatal(err)
 	}