@@ -5,12 +5,14 @@ import (
5
5
6
6
"github.com/stretchr/testify/require"
7
7
8
+ "cosmossdk.io/math"
9
+ upgradetypes "cosmossdk.io/x/upgrade/types"
10
+
8
11
sdk "github.com/cosmos/cosmos-sdk/types"
9
12
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
10
13
distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
11
14
govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
12
15
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
13
- upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
14
16
15
17
"github.com/cosmos/gaia/v19/ante"
16
18
"github.com/cosmos/gaia/v19/app/helpers"
@@ -41,14 +43,6 @@ func TestGovExpeditedProposalsDecorator(t *testing.T) {
41
43
},
42
44
expectErr : false ,
43
45
},
44
- {
45
- name : "expedited - govv1.MsgSubmitProposal - LegacySoftwareUpgrade" ,
46
- ctx : sdk.Context {},
47
- msgs : []sdk.Msg {
48
- newLegacyUpgradeProp (true ), // expedite
49
- },
50
- expectErr : false ,
51
- },
52
46
{
53
47
name : "expedited - govv1.MsgSubmitProposal - MsgCancelUpgrade" ,
54
48
ctx : sdk.Context {},
@@ -59,30 +53,6 @@ func TestGovExpeditedProposalsDecorator(t *testing.T) {
59
53
},
60
54
expectErr : false ,
61
55
},
62
- {
63
- name : "expedited - govv1.MsgSubmitProposal - LegacyCancelUpgrade" ,
64
- ctx : sdk.Context {},
65
- msgs : []sdk.Msg {
66
- newLegacyCancelProp (true ), // expedite
67
- },
68
- expectErr : false ,
69
- },
70
- {
71
- name : "normal - govv1.MsgSubmitProposal - LegacySoftwareUpgrade" ,
72
- ctx : sdk.Context {},
73
- msgs : []sdk.Msg {
74
- newLegacyUpgradeProp (false ), // normal
75
- },
76
- expectErr : false ,
77
- },
78
- {
79
- name : "normal - govv1.MsgSubmitProposal - LegacyCancelUpgrade" ,
80
- ctx : sdk.Context {},
81
- msgs : []sdk.Msg {
82
- newLegacyCancelProp (false ), // normal
83
- },
84
- expectErr : false ,
85
- },
86
56
{
87
57
name : "normal - govv1.MsgSubmitProposal - TextProposal" ,
88
58
ctx : sdk.Context {},
@@ -98,7 +68,7 @@ func TestGovExpeditedProposalsDecorator(t *testing.T) {
98
68
newGovProp ([]sdk.Msg {& distrtypes.MsgCommunityPoolSpend {
99
69
Authority : "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn" ,
100
70
Recipient : sdk.AccAddress {}.String (),
101
- Amount : sdk .NewCoins (sdk .NewCoin ("stake" , sdk .NewInt (100 ))),
71
+ Amount : sdk .NewCoins (sdk .NewCoin ("stake" , math .NewInt (100 ))),
102
72
}}, false ), // normal
103
73
},
104
74
expectErr : false ,
@@ -110,7 +80,7 @@ func TestGovExpeditedProposalsDecorator(t *testing.T) {
110
80
newGovProp ([]sdk.Msg {& banktypes.MsgSend {
111
81
FromAddress : "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn" ,
112
82
ToAddress : "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn" ,
113
- Amount : sdk .NewCoins (sdk .NewCoin ("stake" , sdk .NewInt (100 ))),
83
+ Amount : sdk .NewCoins (sdk .NewCoin ("stake" , math .NewInt (100 ))),
114
84
}}, false ), // normal
115
85
},
116
86
expectErr : false ,
@@ -164,7 +134,7 @@ func TestGovExpeditedProposalsDecorator(t *testing.T) {
164
134
newGovProp ([]sdk.Msg {& distrtypes.MsgCommunityPoolSpend {
165
135
Authority : "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn" ,
166
136
Recipient : sdk.AccAddress {}.String (),
167
- Amount : sdk .NewCoins (sdk .NewCoin ("stake" , sdk .NewInt (100 ))),
137
+ Amount : sdk .NewCoins (sdk .NewCoin ("stake" , math .NewInt (100 ))),
168
138
}}, true ),
169
139
},
170
140
expectErr : true ,
@@ -176,7 +146,7 @@ func TestGovExpeditedProposalsDecorator(t *testing.T) {
176
146
newGovProp ([]sdk.Msg {& banktypes.MsgSend {
177
147
FromAddress : "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn" ,
178
148
ToAddress : "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn" ,
179
- Amount : sdk .NewCoins (sdk .NewCoin ("stake" , sdk .NewInt (100 ))),
149
+ Amount : sdk .NewCoins (sdk .NewCoin ("stake" , math .NewInt (100 ))),
180
150
}}, true ),
181
151
},
182
152
expectErr : true ,
@@ -223,19 +193,6 @@ func newLegacyTextProp(expedite bool) *govv1.MsgSubmitProposal {
223
193
return newGovProp ([]sdk.Msg {msgContent }, expedite )
224
194
}
225
195
226
- func newLegacyUpgradeProp (expedite bool ) * govv1.MsgSubmitProposal {
227
- prop := upgradetypes .NewSoftwareUpgradeProposal ("test legacy upgrade" , "test legacy upgrade" , upgradetypes.Plan {
228
- Name : "upgrade plan-plan" ,
229
- Info : "some text here" ,
230
- Height : 123456789 ,
231
- })
232
- msgContent , err := govv1 .NewLegacyContent (prop , "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn" )
233
- if err != nil {
234
- return nil
235
- }
236
- return newGovProp ([]sdk.Msg {msgContent }, expedite )
237
- }
238
-
239
196
func newGovV1BETA1LegacyUpgradeProp () * govv1beta1.MsgSubmitProposal {
240
197
legacyContent := upgradetypes .NewSoftwareUpgradeProposal ("test legacy upgrade" , "test legacy upgrade" , upgradetypes.Plan {
241
198
Name : "upgrade plan-plan" ,
@@ -254,15 +211,6 @@ func newGovV1BETA1LegacyCancelUpgradeProp() *govv1beta1.MsgSubmitProposal {
254
211
return msg
255
212
}
256
213
257
- func newLegacyCancelProp (expedite bool ) * govv1.MsgSubmitProposal {
258
- prop := upgradetypes .NewCancelSoftwareUpgradeProposal ("test legacy upgrade" , "test legacy upgrade" )
259
- msgContent , err := govv1 .NewLegacyContent (prop , "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn" )
260
- if err != nil {
261
- return nil
262
- }
263
- return newGovProp ([]sdk.Msg {msgContent }, expedite )
264
- }
265
-
266
214
func newGovProp (msgs []sdk.Msg , expedite bool ) * govv1.MsgSubmitProposal {
267
215
msg , _ := govv1 .NewMsgSubmitProposal (msgs , sdk .NewCoins (), sdk.AccAddress {}.String (), "" , "expedite" , "expedite" , expedite )
268
216
// fmt.Println("### msg ###", msg, "err", err)
0 commit comments