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

reduce redundancy in 24 host #7959

Merged
merged 4 commits into from
Nov 17, 2020
Merged

reduce redundancy in 24 host #7959

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
433d264
reduce redundancy
colin-axner Nov 17, 2020
3ace101
Merge branch 'master' into colin/7922-redundancy-24-host
colin-axner Nov 17, 2020
b9a8e53
Merge branch 'master' into colin/7922-redundancy-24-host
mergify[bot] Nov 17, 2020
ef8c8a3
Merge branch 'master' into colin/7922-redundancy-24-host
mergify[bot] Nov 17, 2020
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
6 changes: 3 additions & 3 deletions x/ibc/core/24-host/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func ClientStateKey() []byte {
// FullConsensusStatePath takes a client identifier and returns a Path under which to
// store the consensus state of a client.
func FullConsensusStatePath(clientID string, height exported.Height) string {
return FullClientPath(clientID, fmt.Sprintf("%s/%s", KeyConsensusStatePrefix, height))
return FullClientPath(clientID, ConsensusStatePath(height))
}

// FullConsensusStateKey returns the store key for the consensus state of a particular
Expand Down Expand Up @@ -177,7 +177,7 @@ func NextSequenceAckKey(portID, channelID string) []byte {

// PacketCommitmentPath defines the commitments to packet data fields store path
func PacketCommitmentPath(portID, channelID string, sequence uint64) string {
return fmt.Sprintf("%s/%s/%s", KeyPacketCommitmentPrefix, channelPath(portID, channelID), sequencePath(sequence))
return fmt.Sprintf("%s/%d", PacketCommitmentPrefixPath(portID, channelID), sequence)
}

// PacketCommitmentKey returns the store key of under which a packet commitment
Expand All @@ -193,7 +193,7 @@ func PacketCommitmentPrefixPath(portID, channelID string) string {

// PacketAcknowledgementPath defines the packet acknowledgement store path
func PacketAcknowledgementPath(portID, channelID string, sequence uint64) string {
return fmt.Sprintf("%s/%s/%s", KeyPacketAckPrefix, channelPath(portID, channelID), sequencePath(sequence))
return fmt.Sprintf("%s/%d", PacketAcknowledgementPrefixPath(portID, channelID), sequence)
}

// PacketAcknowledgementKey returns the store key of under which a packet
Expand Down