fix: remove duplicated app.Close call (backport #17619) (#17634)

Co-authored-by: yihuang <[email protected]> Co-authored-by: Julien Robert <[email protected]>
cosmos · Sep 6, 2023 · 1ee1b4c · 1ee1b4c
1 parent d662783
commit 1ee1b4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/server/start.go b/server/start.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -277,7 +276,7 @@ func startStandAlone(svrCtx *Context, app types.Application, opts StartCmdOption
 		// so we can gracefully stop the ABCI server.
 		<-ctx.Done()
 		svrCtx.Logger.Info("stopping the ABCI server...")
-		return errors.Join(svr.Stop(), app.Close())
+		return svr.Stop()
 	})
 
 	return g.Wait()
@@ -375,7 +374,6 @@ func startCmtNode(
 	cleanupFn = func() {
 		if tmNode != nil && tmNode.IsRunning() {
 			_ = tmNode.Stop()
-			_ = app.Close()
 		}
 	}
 

diff --git a/simapp/simd/cmd/testnet.go b/simapp/simd/cmd/testnet.go
@@ -342,6 +342,7 @@ func initTestnetFiles(
 			return err
 		}
 
+		srvconfig.SetConfigTemplate(srvconfig.DefaultConfigTemplate)
 		srvconfig.WriteConfigFile(filepath.Join(nodeDir, "config", "app.toml"), simappConfig)
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -342,6 +342,7 @@ func initTestnetFiles( @@
     			return err
     		}
+    		srvconfig.SetConfigTemplate(srvconfig.DefaultConfigTemplate)
     		srvconfig.WriteConfigFile(filepath.Join(nodeDir, "config", "app.toml"), simappConfig)
     	}
@@ Expand Down @@