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

fix: merge error #149

Merged
merged 1 commit into from
Nov 7, 2024
Merged

fix: merge error #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions state/txindex/kv/kv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,20 +397,11 @@ type TxInfo struct {

func (*TxIndex) setTmpHashes(tmpHeights map[string]TxInfo, key, value []byte, height int64) {
eventSeq := extractEventSeqFromKey(key)
<<<<<<< HEAD
txInfo := TxInfo{
TxBytes: value,
Height: height,
}
tmpHeights[string(value)+eventSeq] = txInfo
=======

// Copy the value because the iterator will be reused.
valueCopy := make([]byte, len(value))
copy(valueCopy, value)

tmpHeights[string(valueCopy)+eventSeq] = valueCopy
>>>>>>> upstream/v0.38.x
}

// match returns all matching txs by hash that meet a given condition and start
Expand Down
Loading