From ff8400a124d1e5e9a32b0620d32f6da4d9863e4a Mon Sep 17 00:00:00 2001
From: Haiko Schol <539509+haikoschol@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:40:39 +0700
Subject: [PATCH] fix(dot/sync): ensure node can be stopped before min peers
 have been acquired (#4291)

---
 config/config.go                                   | 2 +-
 docs/docs/usage/command-line.md                    | 2 +-
 dot/sync/service.go                                | 6 +-----
 zombienet_tests/functional/0001-basic-network.toml | 6 +++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/config/config.go b/config/config.go
index 1b15edef1c..4c50fe3d67 100644
--- a/config/config.go
+++ b/config/config.go
@@ -43,7 +43,7 @@ const (
 	// DefaultDiscoveryInterval is the default discovery interval
 	DefaultDiscoveryInterval = 10 * time.Second
 	// DefaultMinPeers is the default minimum number of peers
-	DefaultMinPeers = 0
+	DefaultMinPeers = 5
 	// DefaultMaxPeers is the default maximum number of peers
 	DefaultMaxPeers = 50
 
diff --git a/docs/docs/usage/command-line.md b/docs/docs/usage/command-line.md
index 9b374a261b..58a12908e7 100644
--- a/docs/docs/usage/command-line.md
+++ b/docs/docs/usage/command-line.md
@@ -32,7 +32,7 @@ These are the flags that can be used with the `gossamer` command
 	    By default, all modules log 'info'.
 	    The global log level can be set with --log global=debug
 --max-peers Maximum number of peers to connect to (default 50)
---min-peers Minimum number of peers to connect to (default 0)
+--min-peers Minimum number of peers to connect to (default 5)
 --name Name of the node
 --no-bootstrap Disables network bootstrapping (mdns still enabled)
 --no-mdns Disables network mdns discovery
diff --git a/dot/sync/service.go b/dot/sync/service.go
index 11013ff9dc..8873de0002 100644
--- a/dot/sync/service.go
+++ b/dot/sync/service.go
@@ -141,11 +141,7 @@ func (s *SyncService) waitWorkers() {
 		}
 
 		err = s.network.BlockAnnounceHandshake(bestBlockHeader)
-		if err != nil {
-			if errors.Is(err, network.ErrNoPeersConnected) {
-				continue
-			}
-
+		if err != nil && !errors.Is(err, network.ErrNoPeersConnected) {
 			logger.Criticalf("waiting workers: %s", err.Error())
 			break
 		}
diff --git a/zombienet_tests/functional/0001-basic-network.toml b/zombienet_tests/functional/0001-basic-network.toml
index b6e6001499..3cb5f0bd06 100644
--- a/zombienet_tests/functional/0001-basic-network.toml
+++ b/zombienet_tests/functional/0001-basic-network.toml
@@ -7,16 +7,16 @@ chain = "westend-local"
 name = "alice"
 command = "gossamer"
 validator = true
-args = ["--key alice"]
+args = ["--key alice", "--min-peers 0"]
 
 [[relaychain.nodes]]
 name = "bob"
 command = "gossamer"
 validator = true
-args = ["--key bob"]
+args = ["--key bob", "--min-peers 0"]
 
 [[relaychain.nodes]]
 name = "charlie"
 command = "gossamer"
 validator = true
-args = ["--key charlie"]
\ No newline at end of file
+args = ["--key charlie", "--min-peers 0"]
\ No newline at end of file