Clean up app.yaml usage in test

cosmos · Jun 1, 2022 · 2f198b1 · 2f198b1
1 parent cb3de45
commit 2f198b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/simapp/app.go b/simapp/app.go
@@ -198,9 +198,9 @@ func init() {
 }
 
 //go:embed app.yaml
-var appConfigYaml []byte
+var AppConfigYaml []byte
 
-var appConfig = appconfig.LoadYAML(appConfigYaml)
+var appConfig = appconfig.LoadYAML(AppConfigYaml)
 
 // NewSimApp returns a reference to an initialized SimApp.
 func NewSimApp(

diff --git a/simapp/app.yaml b/simapp/app.yaml
@@ -50,11 +50,12 @@ modules:
   - name: bank
     config:
       "@type": cosmos.bank.module.v1.Module
-      blocked_module_accounts:
-        - fee_collector
-        - distribution
-        - mint
-        - bonded_tokens_pool
-        - not_bonded_tokens_pool
-        - gov
-        - nft
+#      uncomment to provide a block list different from the modules mentioned in auth.module_account_permissions
+#      blocked_module_accounts:
+#        - fee_collector
+#        - distribution
+#        - mint
+#        - bonded_tokens_pool
+#        - not_bonded_tokens_pool
+#        - gov
+#        - nft
diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"github.com/cosmos/cosmos-sdk/depinject"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
-	"os"
 	"strconv"
 	"testing"
 	"time"
@@ -510,20 +509,11 @@ func (ao EmptyAppOptions) Get(o string) interface{} {
 	return nil
 }
 
-// LoadAppConfig loads SimApp's app.yaml DI config into memory for testing purposes.
-func LoadAppConfig() depinject.Config {
-	yaml, err := os.ReadFile("app.yaml")
-	if err != nil {
-		panic("Unable to read app.yaml")
-	}
-	return appconfig.LoadYAML(yaml)
-}
-
 // ModuleAccountAddrs provides a list of blocked module accounts from configuration in app.yaml
 //
 // Ported from SimApp
 func ModuleAccountAddrs() map[string]bool {
-	cfg := LoadAppConfig()
+	cfg := appconfig.LoadYAML(AppConfigYaml)
 	var bk bankkeeper.Keeper
 	err := depinject.Inject(cfg, &bk)
 	if err != nil {