Skip to content

V0.38.6 geodec #2

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

Open
namn-grg wants to merge 7 commits into
base: v0.38.x
Choose a base branch
from
+7 −7
Open

V0.38.6 geodec #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
346e4c3
fix: made mempool logs small
namn-grg Mar 28, 2024
eadf33d
fix: remove consensus ps log
namn-grg Mar 28, 2024
86b1e04
fix: remove consensus aunts log
namn-grg Mar 28, 2024
feebdb0
commited tx not in local mempool
namn-grg Mar 28, 2024
4fd822e
block data
namn-grg Mar 29, 2024
d2cdca8
receive src
namn-grg Mar 29, 2024
81cb624
Merge pull request #1 from GeoDecConsensus/v0.38.x
namn-grg Apr 13, 2024
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
4 changes: 2 additions & 2 deletions consensus/reactor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ func (conR *Reactor) Receive(e p2p.Envelope) {
return
}

conR.Logger.Debug("Receive", "src", e.Src, "chId", e.ChannelID, "msg", msg)
conR.Logger.Debug("Receive", "src", e.Src, "chId", e.ChannelID, "msg", "msg")

// Get peer states
ps, ok := e.Src.Get(types.PeerStateKey).(*PeerState)
Expand Down Expand Up @@ -1146,7 +1146,7 @@ func (ps *PeerState) SetHasProposalBlockPart(height int64, round int32, index in
// Returns true if vote was sent.
func (ps *PeerState) PickSendVote(votes types.VoteSetReader) bool {
if vote, ok := ps.PickVoteToSend(votes); ok {
ps.logger.Debug("Sending vote message", "ps", ps, "vote", vote)
ps.logger.Debug("Sending vote message", "ps", "ps", "vote", vote)
if ps.peer.Send(p2p.Envelope{
ChannelID: VoteChannel,
Message: &cmtcons.Vote{
Expand Down
2 changes: 1 addition & 1 deletion consensus/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,7 @@ func (cs *State) finalizeCommit(height int64) {
"root", block.AppHash,
"num_txs", len(block.Txs),
)
logger.Debug("committed block", "block", log.NewLazySprintf("%v", block))
logger.Debug("committed block", "block", log.NewLazyBlockHash(block), "log.NewLazySprintf(v, block)")

fail.Fail() // XXX

Expand Down
2 changes: 1 addition & 1 deletion mempool/clist_mempool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ func (mem *CListMempool) Update(
// https://github.com/tendermint/tendermint/issues/3322.
if err := mem.RemoveTxByKey(tx.Key()); err != nil {
mem.logger.Debug("Committed transaction not in local mempool (not an error)",
"key", tx.Key(),
"key", "tx.Key()",
"error", err.Error())
}
}
Expand Down
6 changes: 3 additions & 3 deletions mempool/reactor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (memR *Reactor) RemovePeer(peer p2p.Peer, _ interface{}) {
// Receive implements Reactor.
// It adds any received transactions to the mempool.
func (memR *Reactor) Receive(e p2p.Envelope) {
memR.Logger.Debug("Receive", "src", e.Src, "chId", e.ChannelID, "msg", e.Message)
memR.Logger.Debug("Receive", "src", "e.Src", "chId", e.ChannelID, "msg", "e.Message")
switch msg := e.Message.(type) {
case *protomem.Txs:
protoTxs := msg.GetTxs()
Expand All @@ -155,9 +155,9 @@ func (memR *Reactor) Receive(e p2p.Envelope) {
ntx := types.Tx(tx)
err = memR.mempool.CheckTx(ntx, nil, txInfo)
if errors.Is(err, ErrTxInCache) {
memR.Logger.Debug("Tx already exists in cache", "tx", ntx.String())
memR.Logger.Debug("Tx already exists in cache", "tx", "ntx.String()")
} else if err != nil {
memR.Logger.Info("Could not check tx", "tx", ntx.String(), "err", err)
memR.Logger.Info("Could not check tx", "tx", "ntx.String()", "err", err)
}
}
default:
Expand Down