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

chore: remove references to AllowUpdateAfterExpiry, AllowUpdateAfterMisbehaviour #1843

Merged
merged 18 commits into from
Aug 9, 2022
Merged

chore: remove references to AllowUpdateAfterExpiry, AllowUpdateAfterMisbehaviour #1843

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b5f3fdd
initial removal
charleenfei Jul 21, 2022
fee23d6
start update changelog
charleenfei Jul 22, 2022
e2a4232
Merge branch 'main' into charly/remove_ref_allow_update
charleenfei Jul 22, 2022
c4829cd
rm deprecated tests
charleenfei Jul 22, 2022
2c47b23
Merge branch 'main' into charly/remove_ref_allow_update
charleenfei Jul 26, 2022
595a98d
update CHANGELOG
charleenfei Jul 26, 2022
369d52b
Merge branch 'charly/remove_ref_allow_update' of github.com:cosmos/ib…
charleenfei Jul 26, 2022
f52f450
merge against 02-client-refactor
charleenfei Jul 28, 2022
6065354
update re: comments
charleenfei Jul 28, 2022
370b12b
Merge branch 'main' into charly/remove_ref_allow_update
charleenfei Jul 28, 2022
efbe8ba
Merge branch 'main' into charly/remove_ref_allow_update
charleenfei Aug 1, 2022
7f5f546
Merge branch 'main' into charly/remove_ref_allow_update
charleenfei Aug 3, 2022
fed46d1
Merge branch 'main' into charly/remove_ref
charleenfei Aug 9, 2022
ba4b1c8
update clientstate
charleenfei Aug 9, 2022
60fc4ac
update re: merge conflicts
charleenfei Aug 9, 2022
f3b0669
re-add file
charleenfei Aug 9, 2022
801a1e7
update tests
charleenfei Aug 9, 2022
15acb28
Merge branch 'main' into charly/remove_ref
charleenfei Aug 9, 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
Prev Previous commit
Next Next commit
update clientstate
  • Loading branch information
@charleenfei
charleenfei committed Aug 9, 2022
commit ba4b1c80c9dfb2366d0d4b1648ab8841cc12c09f
22 changes: 10 additions & 12 deletions modules/light-clients/07-tendermint/client_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,18 @@ func NewClientState(
chainID string, trustLevel Fraction,
trustingPeriod, ubdPeriod, maxClockDrift time.Duration,
latestHeight clienttypes.Height, specs []*ics23.ProofSpec,
upgradePath []string, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool,
upgradePath []string,
) *ClientState {
return &ClientState{
ChainId: chainID,
TrustLevel: trustLevel,
TrustingPeriod: trustingPeriod,
UnbondingPeriod: ubdPeriod,
MaxClockDrift: maxClockDrift,
LatestHeight: latestHeight,
FrozenHeight: clienttypes.ZeroHeight(),
ProofSpecs: specs,
UpgradePath: upgradePath,
AllowUpdateAfterExpiry: allowUpdateAfterExpiry,
AllowUpdateAfterMisbehaviour: allowUpdateAfterMisbehaviour,
ChainId: chainID,
TrustLevel: trustLevel,
TrustingPeriod: trustingPeriod,
UnbondingPeriod: ubdPeriod,
MaxClockDrift: maxClockDrift,
LatestHeight: latestHeight,
FrozenHeight: clienttypes.ZeroHeight(),
ProofSpecs: specs,
UpgradePath: upgradePath,
}
}

Expand Down
28 changes: 14 additions & 14 deletions modules/light-clients/07-tendermint/client_state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,78 +75,78 @@ func (suite *TendermintTestSuite) TestValidate() {
}{
{
name: "valid client",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: true,
},
{
name: "valid client with nil upgrade path",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), nil, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), nil),
expPass: true,
},
{
name: "invalid chainID",
clientState: ibctm.NewClientState(" ", ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(" ", ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: false,
},
{
// NOTE: if this test fails, the code must account for the change in chainID length across tendermint versions!
// Do not only fix the test, fix the code!
// https://github.com/cosmos/ibc-go/issues/177
name: "valid chainID - chainID validation failed for chainID of length 50! ",
clientState: ibctm.NewClientState(fiftyCharChainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(fiftyCharChainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: true,
},
{
// NOTE: if this test fails, the code must account for the change in chainID length across tendermint versions!
// Do not only fix the test, fix the code!
// https://github.com/cosmos/ibc-go/issues/177
name: "invalid chainID - chainID validation did not fail for chainID of length 51! ",
clientState: ibctm.NewClientState(fiftyOneCharChainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(fiftyOneCharChainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: false,
},
{
name: "invalid trust level",
clientState: ibctm.NewClientState(chainID, ibctm.Fraction{Numerator: 0, Denominator: 1}, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.Fraction{Numerator: 0, Denominator: 1}, trustingPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: false,
},
{
name: "invalid trusting period",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, 0, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, 0, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: false,
},
{
name: "invalid unbonding period",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, 0, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, 0, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: false,
},
{
name: "invalid max clock drift",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, 0, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, 0, height, commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: false,
},
{
name: "invalid revision number",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(1, 1), commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.NewHeight(1, 1), commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: false,
},
{
name: "invalid revision height",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, clienttypes.ZeroHeight(), commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: false,
},
{
name: "trusting period not less than unbonding period",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, commitmenttypes.GetSDKSpecs(), upgradePath),
expPass: false,
},
{
name: "proof specs is nil",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, nil, upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, nil, upgradePath),
expPass: false,
},
{
name: "proof specs contains nil",
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, []*ics23.ProofSpec{ics23.TendermintSpec, nil}, upgradePath, false, false),
clientState: ibctm.NewClientState(chainID, ibctm.DefaultTrustLevel, ubdPeriod, ubdPeriod, maxClockDrift, height, []*ics23.ProofSpec{ics23.TendermintSpec, nil}, upgradePath),
expPass: false,
},
}
Expand Down
2 changes: 1 addition & 1 deletion testing/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type ClientConfig interface {
}

type TendermintConfig struct {
TrustLevel ibctmtypes.Fraction
TrustLevel ibctm.Fraction
TrustingPeriod time.Duration
UnbondingPeriod time.Duration
MaxClockDrift time.Duration
Expand Down