Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unneeded const variables #418

Merged
merged 8 commits into from
Nov 1, 2022
Merged

Remove unneeded const variables #418

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
008c637
wip
shaspitz Oct 20, 2022
18e1ee6
diff test patch (#412)
danwt Oct 20, 2022
8f359f6
add back setter
shaspitz Oct 21, 2022
79ce1a3
comment
shaspitz Oct 21, 2022
2d656a3
Merge branch 'main' into consumer-unbonding-param
shaspitz Oct 25, 2022
6c301ad
remove compute consumer unbonding
shaspitz Oct 27, 2022
9c1e0fc
Update params.go
shaspitz Oct 27, 2022
b9762ff
Merge branch 'main' into im-tired-of-param-prs
shaspitz Oct 28, 2022
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
30 changes: 17 additions & 13 deletions x/ccv/provider/types/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,13 @@ import (
clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types"
ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
consumertypes "github.com/cosmos/interchain-security/x/ccv/consumer/types"
ccvtypes "github.com/cosmos/interchain-security/x/ccv/types"
)

const (
// DefaultTrustingPeriod is duration of the period since
// the LastestTimestamp during which the submitted headers are valid for upgrade
DefaultTrustingPeriod = 3 * 7 * 24 * time.Hour

// DefaultUnbondingPeriod of the staking unbonding period
DefaultUnbondingPeriod = 4 * 7 * 24 * time.Hour

// DefaultMaxClockDrift defines how much new (untrusted) header's Time can drift into the future.
// This default is only used in the default template client param.
DefaultMaxClockDrift = 10 * time.Second

// DefaultTrustingPeriodFraction is the default fraction used to compute TrustingPeriod
Expand All @@ -39,10 +34,10 @@ func ParamKeyTable() paramtypes.KeyTable {
}

// NewParams creates new provider parameters with provided arguments
func NewParams(cs *ibctmtypes.ClientState, ccvTimeoutPeriod time.Duration,
func NewParams(templateClient *ibctmtypes.ClientState, ccvTimeoutPeriod time.Duration,
trustingPeriodFraction int64) Params {
return Params{
TemplateClient: cs,
TemplateClient: templateClient,
CcvTimeoutPeriod: ccvTimeoutPeriod,
TrustingPeriodFraction: trustingPeriodFraction,
}
Expand All @@ -53,8 +48,17 @@ func DefaultParams() Params {
// create default client state with chainID, trusting period, unbonding period, and inital height zeroed out.
// these fields will be populated during proposal handler.
return NewParams(
ibctmtypes.NewClientState("", ibctmtypes.DefaultTrustLevel, 0, 0,
DefaultMaxClockDrift, clienttypes.Height{}, commitmenttypes.GetSDKSpecs(), []string{"upgrade", "upgradedIBCState"}, true, true),
ibctmtypes.NewClientState(
"", // chainID
ibctmtypes.DefaultTrustLevel,
0, // trusting period
0, // unbonding period
DefaultMaxClockDrift,
clienttypes.Height{}, // latest(initial) height
commitmenttypes.GetSDKSpecs(),
[]string{"upgrade", "upgradedIBCState"},
true,
true),
ccvtypes.DefaultCCVTimeoutPeriod,
DefaultTrustingPeriodFraction,
)
Expand Down Expand Up @@ -97,8 +101,8 @@ func validateTemplateClient(i interface{}) error {

// populate zeroed fields with valid fields
copiedClient.ChainId = "chainid"
copiedClient.TrustingPeriod = DefaultTrustingPeriod
copiedClient.UnbondingPeriod = DefaultUnbondingPeriod
copiedClient.TrustingPeriod = consumertypes.DefaultConsumerUnbondingPeriod / DefaultTrustingPeriodFraction
copiedClient.UnbondingPeriod = consumertypes.DefaultConsumerUnbondingPeriod
copiedClient.LatestHeight = clienttypes.NewHeight(0, 1)

if err := copiedClient.Validate(); err != nil {
Expand Down