use closure for file.close

cmd/chain-maind/app/app.go

@@ -152,28 +152,29 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 			return err
 		}
 
+		defer func() {
+			cerr := file.Close()
+			if err == nil {
+				err = cerr
+			}
+		}()
+
 		var genesis map[string]interface{}
 		if err := json.NewDecoder(file).Decode(&genesis); err != nil {
-			file.Close()
 			return err
 		}
 
 		if err := mergo.Merge(&genesis, genesisPatch, mergo.WithOverride); err != nil {
-			file.Close()
 			return err
 		}
 		if err := file.Truncate(0); err != nil {
-			file.Close()
 			return err
 		}
 		if _, err := file.Seek(0, 0); err != nil {
-			file.Close()
 			return err
 		}
 
-		ret := json.NewEncoder(file).Encode(&genesis)
-		file.Close()
-		return ret
+		return json.NewEncoder(file).Encode(&genesis)
 	}
 
 	rootCmd.AddCommand(

x/genutil/client/cli/gentx.go

@@ -270,13 +270,18 @@ func writeSignedGenTx(clientCtx client.Context, outputDocument string, tx sdk.Tx
 		return err
 	}
 
+	defer func() {
+		cerr := outputFile.Close()
+		if err == nil {
+			err = cerr
+		}
+	}()
+
 	json, err := clientCtx.TxConfig.TxJSONEncoder()(tx)
 	if err != nil {
-		outputFile.Close()
 		return err
 	}
 
 	_, err = fmt.Fprintf(outputFile, "%s\n", json)
-	outputFile.Close()
 	return err
 }