Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions app/testnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ type TestnetValidator struct {
Delegations []TestnetDelegation
}

type TestnetGov struct {
VotePeriod time.Duration `json:"vote_period"`
ExpeditedVotePeriod time.Duration `json:"expedited_vote_period"`
type TestnetGovConfig struct {
VotingParams *struct {
VotingPeriod time.Duration `json:"voting_period,omitempty"`
ExpeditedVotePeriod time.Duration `json:"expedited_vote_period"`
} `json:"voting_params,omitempty"`
}

type TestnetUpgrade struct {
Expand All @@ -59,7 +61,7 @@ type TestnetAccount struct {
type TestnetConfig struct {
Accounts []TestnetAccount
Validators []TestnetValidator
Gov TestnetGov
Gov TestnetGovConfig
Upgrade TestnetUpgrade
}

Expand Down Expand Up @@ -256,8 +258,8 @@ func InitAkashAppForTestnet(
if err != nil {
panic(err.Error())
}
govParams.ExpeditedVotingPeriod = &tcfg.Gov.ExpeditedVotePeriod
govParams.VotingPeriod = &tcfg.Gov.VotePeriod
govParams.ExpeditedVotingPeriod = &tcfg.Gov.VotingParams.ExpeditedVotePeriod
govParams.VotingPeriod = &tcfg.Gov.VotingParams.VotingPeriod
govParams.MinDeposit = sdk.NewCoins(sdk.NewInt64Coin(sdkutil.DenomUakt, 100000000))
govParams.ExpeditedMinDeposit = sdk.NewCoins(sdk.NewInt64Coin(sdkutil.DenomUakt, 150000000))

Expand Down
2 changes: 1 addition & 1 deletion cmd/akash/cmd/testnetify/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ type TestnetConfig struct {
ChainID string `json:"chain_id"`
Validators TestnetValidators `json:"validators"`
Accounts []akash.TestnetAccount `json:"accounts"`
Gov akash.TestnetGov `json:"gov"`
Gov akash.TestnetGovConfig `json:"gov"`
upgrade akash.TestnetUpgrade
}

Expand Down
3 changes: 2 additions & 1 deletion tests/upgrade/testnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"chain_id": "localakash",
"gov": {
"voting_params": {
"voting_period": "60s"
"voting_period": "60s",
"expedited_vote_period": "60s"
}
},
"accounts": [
Expand Down
Loading