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

R4R: staking spec upgrades / some renaming #3357

Merged
merged 22 commits into from
Feb 8, 2019
Merged

R4R: staking spec upgrades / some renaming #3357

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
699792d
state.md additions
rigelrozanski Jan 23, 2019
0e914f6
Merge remote-tracking branch 'origin/develop' into rigel/staking-spec…
rigelrozanski Jan 23, 2019
435c7e0
working state transitions
rigelrozanski Jan 23, 2019
6dc9dc0
Merge remote-tracking branch 'origin/develop' into rigel/staking-spec…
rigelrozanski Jan 25, 2019
495f779
refactor and high level lists for state transitions
rigelrozanski Jan 25, 2019
e388919
fix compile
rigelrozanski Jan 25, 2019
058d654
fix test
rigelrozanski Jan 25, 2019
c3fc6a5
...
rigelrozanski Jan 25, 2019
51b574a
...
rigelrozanski Jan 25, 2019
60cb37f
Merge remote-tracking branch 'origin/develop' into rigel/staking-spec…
rigelrozanski Feb 4, 2019
e42ed1a
working
rigelrozanski Feb 6, 2019
91afb64
Merge remote-tracking branch 'origin/develop' into rigel/staking-spec…
rigelrozanski Feb 6, 2019
f314803
merge fixes
rigelrozanski Feb 6, 2019
5a2e029
state transition updates
rigelrozanski Feb 6, 2019
cf6e0e1
state transitions
rigelrozanski Feb 7, 2019
0d73606
pending
rigelrozanski Feb 7, 2019
f9824a5
Apply suggestions from code review
alexanderbez Feb 7, 2019
2d119a2
address @alexanderbez comments
rigelrozanski Feb 7, 2019
cdb5eb8
Apply suggestions from code review
cwgoes Feb 7, 2019
f712c60
Merge remote-tracking branch 'origin/develop' into rigel/staking-spec…
rigelrozanski Feb 8, 2019
d64e8c8
chris comments
rigelrozanski Feb 8, 2019
8d551ae
Merge branch 'develop' into rigel/staking-spec-upgradesx2
rigelrozanski Feb 8, 2019
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
Merge remote-tracking branch 'origin/develop' into rigel/staking-spec… 
…-upgradesx2
  • Loading branch information
@rigelrozanski
rigelrozanski committed Feb 4, 2019
commit 60cb37f0789068a8d498e320a57a5705822e6d1b
8 changes: 4 additions & 4 deletions x/staking/types/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ func DefaultParams() Params {
// String returns a human readable string representation of the parameters.
func (p Params) String() string {
return fmt.Sprintf(`Params:
Unbonding Time: %s
Max Validators: %d
Max Entries: %d
Bonded Coin Denomination: %s`, p.UnbondingTime,
Unbonding Time: %s
Max Validators: %d
Max Entries: %d
Bonded Coin Denom: %s`, p.UnbondingTime,
p.MaxValidators, p.MaxEntries, p.BondDenom)
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.