From 61f668aa029f660f33cee6db1e5d48db6490cfd9 Mon Sep 17 00:00:00 2001 From: colin axner Date: Thu, 15 Aug 2019 15:29:21 -0700 Subject: [PATCH] Merge PR #4913: Fix Module Account Blacklisting in SimApp --- app.go | 2 +- app_test.go | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app.go b/app.go index b356cbef5b01..7037922a24cf 100644 --- a/app.go +++ b/app.go @@ -253,7 +253,7 @@ func (app *SimApp) LoadHeight(height int64) error { func (app *SimApp) ModuleAccountAddrs() map[string]bool { modAccAddrs := make(map[string]bool) for acc := range maccPerms { - modAccAddrs[app.SupplyKeeper.GetModuleAddress(acc).String()] = true + modAccAddrs[supply.NewModuleAddress(acc).String()] = true } return modAccAddrs diff --git a/app_test.go b/app_test.go index 6e5635eadb67..4cddce7b6786 100644 --- a/app_test.go +++ b/app_test.go @@ -36,6 +36,16 @@ func TestSimAppExport(t *testing.T) { require.NoError(t, err, "ExportAppStateAndValidators should not have an error") } +// ensure that black listed addresses are properly set in bank keeper +func TestBlackListedAddrs(t *testing.T) { + db := dbm.NewMemDB() + app := NewSimApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0) + + for acc := range maccPerms { + require.True(t, app.BankKeeper.BlacklistedAddr(app.SupplyKeeper.GetModuleAddress(acc))) + } +} + func TestGetMaccPerms(t *testing.T) { dup := GetMaccPerms() require.Equal(t, maccPerms, dup, "duplicated module account permissions differed from actual module account permissions")