mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-04 15:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Ripemd160 the default

Browse Source
This commit is contained in:
Jae Kwon
2015-07-10 12:15:46 -07:00
parent 41845d5b85
commit 2e1d8ba054
10 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mempool/mempool.go
+5 -7
View File
@@ -11,7 +11,6 @@ package mempool
import (
"sync"
"github.com/tendermint/tendermint/binary"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
)
@@ -73,19 +72,18 @@ func (mem *Mempool) ResetForBlockAndState(block *types.Block, state *sm.State) {
// First, create a lookup map of txns in new block.
blockTxsMap := make(map[string]struct{})
for _, tx := range block.Data.Txs {
txHash := binary.BinarySha256(tx)
blockTxsMap[string(txHash)] = struct{}{}
blockTxsMap[string(types.TxID(state.ChainID, tx))] = struct{}{}
}
// Next, filter all txs from mem.txs that are in blockTxsMap
txs := []types.Tx{}
for _, tx := range mem.txs {
txHash := binary.BinarySha256(tx)
if _, ok := blockTxsMap[string(txHash)]; ok {
log.Debug("Filter out, already committed", "tx", tx, "txHash", txHash)
txID := types.TxID(state.ChainID, tx)
if _, ok := blockTxsMap[string(txID)]; ok {
log.Debug("Filter out, already committed", "tx", tx, "txID", txID)
continue
} else {
log.Debug("Filter in, still new", "tx", tx, "txHash", txHash)
log.Debug("Filter in, still new", "tx", tx, "txID", txID)
txs = append(txs, tx)
}
}