From 2d5fadadc09ea9f1fc31591531dbcc35296a9aa7 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Thu, 30 May 2024 18:49:54 +0000 Subject: [PATCH] mixpool: Debug log accepted messages This allows us to remove an unnecessary log from the wallet (which was only being done in RPC mode and missing from SPV). --- mixing/mixpool/mixpool.go | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/mixing/mixpool/mixpool.go b/mixing/mixpool/mixpool.go index 1c240b1c9..69468341b 100644 --- a/mixing/mixpool/mixpool.go +++ b/mixing/mixpool/mixpool.go @@ -22,6 +22,7 @@ import ( "github.com/decred/dcrd/txscript/v4/stdaddr" "github.com/decred/dcrd/txscript/v4/stdscript" "github.com/decred/dcrd/wire" + "github.com/decred/slog" ) const minconf = 1 @@ -838,10 +839,31 @@ var zeroHash chainhash.Hash func (p *Pool) AcceptMessage(msg mixing.Message) (accepted []mixing.Message, err error) { hash := msg.Hash() defer func() { - if err == nil { - log.Tracef("AcceptMessage: accepted message %T %v", msg, hash) - } else { - log.Tracef("AcceptMessage: rejected message %T %v: %v", msg, hash, err) + if err == nil && len(accepted) == 0 { + // Duplicate message; don't log it again. + return + } + if log.Level() > slog.LevelDebug { + return + } + if err != nil { + switch msg.(type) { + case *wire.MsgMixPairReq: + log.Debugf("Rejected message %T %v: %v", msg, hash, err) + default: + log.Debugf("Rejected message %T %v (session %x run %d): %v", + msg, hash, msg.Sid(), msg.GetRun(), err) + } + return + } + for _, msg := range accepted { + switch msg.(type) { + case *wire.MsgMixPairReq: + log.Debugf("Accepted message %T %v", msg, hash) + default: + log.Debugf("Accepted message %T %v (session %x run %d)", + msg, hash, msg.Sid(), msg.GetRun()) + } } }()