From ca3172dad0e9eee2e1f2b2287862b59ca7866db2 Mon Sep 17 00:00:00 2001
From: Ori Newman <orinewman1@gmail.com>
Date: Wed, 12 Aug 2020 16:38:52 +0300
Subject: [PATCH] [NOD-1239] Delete app.WaitForShutdown() (#866)

---
 app/app.go                | 17 ++++++++---------
 integration/setup_test.go |  9 ++-------
 main.go                   |  6 +-----
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/app/app.go b/app/app.go
index a0b3fc970..07b9a0742 100644
--- a/app/app.go
+++ b/app/app.go
@@ -62,11 +62,11 @@ func (a *App) Start() {
 }
 
 // Stop gracefully shuts down all the kaspad services.
-func (a *App) Stop() error {
+func (a *App) Stop() {
 	// Make sure this only happens once.
 	if atomic.AddInt32(&a.shutdown, 1) != 1 {
 		log.Infof("Kaspad is already in the process of shutting down")
-		return nil
+		return
 	}
 
 	log.Warnf("Kaspad shutting down")
@@ -86,7 +86,12 @@ func (a *App) Stop() error {
 		}
 	}
 
-	return nil
+	err = a.addressManager.Stop()
+	if err != nil {
+		log.Errorf("Error stopping address manager: %s", err)
+	}
+
+	return
 }
 
 // New returns a new App instance configured to listen on addr for the
@@ -241,9 +246,3 @@ func (a *App) P2PNodeID() *id.ID {
 func (a *App) AddressManager() *addressmanager.AddressManager {
 	return a.addressManager
 }
-
-// WaitForShutdown blocks until the main listener and peer handlers are stopped.
-func (a *App) WaitForShutdown() {
-	// TODO(libp2p)
-	// a.p2pServer.WaitForShutdown()
-}
diff --git a/integration/setup_test.go b/integration/setup_test.go
index c420014c1..7f594d363 100644
--- a/integration/setup_test.go
+++ b/integration/setup_test.go
@@ -97,14 +97,9 @@ func setRPCClient(t *testing.T, harness *appHarness) {
 }
 
 func teardownHarness(t *testing.T, harness *appHarness) {
-	err := harness.app.Stop()
-	if err != nil {
-		t.Errorf("Error stopping App: %+v", err)
-	}
+	harness.app.Stop()
 
-	harness.app.WaitForShutdown()
-
-	err = harness.databaseContext.Close()
+	err := harness.databaseContext.Close()
 	if err != nil {
 		t.Errorf("Error closing database context: %+v", err)
 	}
diff --git a/main.go b/main.go
index 808823123..c078ae8c0 100644
--- a/main.go
+++ b/main.go
@@ -132,14 +132,10 @@ func kaspadMain(startedChan chan<- struct{}) error {
 	}
 	defer func() {
 		log.Infof("Gracefully shutting down kaspad...")
-		err := app.Stop()
-		if err != nil {
-			log.Errorf("Error stopping kaspad: %+v", err)
-		}
 
 		shutdownDone := make(chan struct{})
 		go func() {
-			app.WaitForShutdown()
+			app.Stop()
 			shutdownDone <- struct{}{}
 		}()