From 55c6d0053d7900ba35e9429d66f11dc7fc5ff3f4 Mon Sep 17 00:00:00 2001 From: Teddy Ding Date: Fri, 19 Jan 2024 00:31:44 -0500 Subject: [PATCH] Remove delaymsg from module_accounts list (#978) --- protocol/app/module_accounts.go | 4 ---- protocol/app/module_accounts_test.go | 4 ---- 2 files changed, 8 deletions(-) diff --git a/protocol/app/module_accounts.go b/protocol/app/module_accounts.go index eaaccca905..8d5e5dcc35 100644 --- a/protocol/app/module_accounts.go +++ b/protocol/app/module_accounts.go @@ -11,7 +11,6 @@ import ( "github.com/dydxprotocol/v4-chain/protocol/app/config" bridgemoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/bridge/types" clobmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/clob/types" - delaymsgtypes "github.com/dydxprotocol/v4-chain/protocol/x/delaymsg/types" rewardsmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/rewards/types" satypes "github.com/dydxprotocol/v4-chain/protocol/x/subaccounts/types" vestmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/vest/types" @@ -50,9 +49,6 @@ var ( vestmoduletypes.CommunityTreasuryAccountName: nil, // community vester account vests funds into the community treasury. vestmoduletypes.CommunityVesterAccountName: nil, - // delaymsg module account doesn't hold funds. It's used as the authority of - // delayed messages. - delaymsgtypes.ModuleName: nil, } // Blocked module accounts which cannot receive external funds. // By default, all non-custom modules (except for gov) are blocked. This prevents diff --git a/protocol/app/module_accounts_test.go b/protocol/app/module_accounts_test.go index eaf735a5c3..6edc04a9b5 100644 --- a/protocol/app/module_accounts_test.go +++ b/protocol/app/module_accounts_test.go @@ -12,7 +12,6 @@ import ( "github.com/dydxprotocol/v4-chain/protocol/app" bridgemoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/bridge/types" clobmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/clob/types" - delaymsgtypes "github.com/dydxprotocol/v4-chain/protocol/x/delaymsg/types" rewardsmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/rewards/types" satypes "github.com/dydxprotocol/v4-chain/protocol/x/subaccounts/types" vestmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/vest/types" @@ -34,7 +33,6 @@ func TestModuleAccountsToAddresses(t *testing.T) { rewardsmoduletypes.VesterAccountName: "dydx1ltyc6y4skclzafvpznpt2qjwmfwgsndp458rmp", vestmoduletypes.CommunityTreasuryAccountName: "dydx15ztc7xy42tn2ukkc0qjthkucw9ac63pgp70urn", vestmoduletypes.CommunityVesterAccountName: "dydx1wxje320an3karyc6mjw4zghs300dmrjkwn7xtk", - delaymsgtypes.ModuleName: "dydx1mkkvp26dngu6n8rmalaxyp3gwkjuzztq5zx6tr", icatypes.ModuleName: "dydx1vlthgax23ca9syk7xgaz347xmf4nunefw3cnv8", } @@ -74,7 +72,6 @@ func TestMaccPerms(t *testing.T) { "rewards_vester": nil, "community_treasury": nil, "community_vester": nil, - "delaymsg": nil, } require.Equal(t, expectedMaccPerms, maccPerms, "default macc perms list does not match expected") } @@ -95,7 +92,6 @@ func TestModuleAccountAddrs(t *testing.T) { "dydx1ltyc6y4skclzafvpznpt2qjwmfwgsndp458rmp": true, // x/rewards.vester "dydx15ztc7xy42tn2ukkc0qjthkucw9ac63pgp70urn": true, // x/vest.communityTreasury "dydx1wxje320an3karyc6mjw4zghs300dmrjkwn7xtk": true, // x/vest.communityVester - "dydx1mkkvp26dngu6n8rmalaxyp3gwkjuzztq5zx6tr": true, // x/delaymsg } require.Equal(t, expectedModuleAccAddresses, app.ModuleAccountAddrs())