Skip to content

Commit 90e5cbe

Browse files
committed
omit loging diffRewardMap on ShelleyStakeAddrs
1 parent faa449b commit 90e5cbe

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/LedgerEvent.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ insertBlockLedgerEvents syncEnv currentEpochNo@(EpochNo curEpoch) =
8989
LedgerRestrainedRewards e rwd creds ->
9090
lift $ adjustEpochRewards syncEnv ntw e rwd creds
9191
LedgerTotalRewards _e rwd ->
92-
lift $ validateEpochRewards tracer ntw (subFromCurrentEpoch 2) currentEpochNo rwd
92+
lift $ validateEpochRewards syncEnv tracer ntw (subFromCurrentEpoch 2) currentEpochNo rwd
9393
LedgerAdaPots _ ->
9494
pure () -- These are handled separately by insertBlock
9595
LedgerGovInfo en ex uncl -> do

cardano-db-sync/src/Cardano/DbSync/Era/Universal/Validate.hs

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ module Cardano.DbSync.Era.Universal.Validate (
1212
import Cardano.BM.Trace (Trace, logError, logInfo, logWarning)
1313
import Cardano.Db (DbLovelace, RewardSource)
1414
import qualified Cardano.Db as Db
15+
import Cardano.DbSync.Api (getTrace)
16+
import Cardano.DbSync.Api.Types (InsertOptions (..), SyncEnv (..), SyncOptions (..))
17+
import Cardano.DbSync.Config.Types (ShelleyInsertConfig (..))
1518
import qualified Cardano.DbSync.Era.Shelley.Generic as Generic
1619
import Cardano.DbSync.Ledger.Event
1720
import Cardano.DbSync.Types
@@ -51,13 +54,14 @@ import GHC.Err (error)
5154

5255
validateEpochRewards ::
5356
(MonadBaseControl IO m, MonadIO m) =>
57+
SyncEnv ->
5458
Trace IO Text ->
5559
Network ->
5660
EpochNo ->
5761
EpochNo ->
5862
Map StakeCred (Set (Ledger.Reward StandardCrypto)) ->
5963
ReaderT SqlBackend m ()
60-
validateEpochRewards tracer network _earnedEpochNo spendableEpochNo rmap = do
64+
validateEpochRewards syncEnv tracer network _earnedEpochNo spendableEpochNo rmap = do
6165
actualCount <- Db.queryNormalEpochRewardCount (unEpochNo spendableEpochNo)
6266
if actualCount /= expectedCount
6367
then do
@@ -70,7 +74,7 @@ validateEpochRewards tracer network _earnedEpochNo spendableEpochNo rmap = do
7074
, " but got "
7175
, textShow actualCount
7276
]
73-
logFullRewardMap tracer spendableEpochNo network (convertPoolRewards rmap)
77+
logFullRewardMap syncEnv spendableEpochNo network (convertPoolRewards rmap)
7478
else do
7579
liftIO . logInfo tracer $
7680
mconcat
@@ -85,16 +89,16 @@ validateEpochRewards tracer network _earnedEpochNo spendableEpochNo rmap = do
8589

8690
logFullRewardMap ::
8791
(MonadBaseControl IO m, MonadIO m) =>
88-
Trace IO Text ->
92+
SyncEnv ->
8993
EpochNo ->
9094
Network ->
9195
Generic.Rewards ->
9296
ReaderT SqlBackend m ()
93-
logFullRewardMap tracer epochNo network ledgerMap = do
97+
logFullRewardMap syncEnv epochNo network ledgerMap = do
9498
dbMap <- queryRewardMap epochNo
9599
when (Map.size dbMap > 0 && Map.size (Generic.unRewards ledgerMap) > 0) $
96100
liftIO $
97-
diffRewardMap tracer network dbMap (Map.mapKeys (Generic.stakingCredHash network) $ Map.map convert $ Generic.unRewards ledgerMap)
101+
diffRewardMap syncEnv network dbMap (Map.mapKeys (Generic.stakingCredHash network) $ Map.map convert $ Generic.unRewards ledgerMap)
98102
where
99103
convert :: Set Generic.Reward -> [(RewardSource, Coin)]
100104
convert = map (\rwd -> (Generic.rewardSource rwd, Generic.rewardAmount rwd)) . Set.toList
@@ -131,15 +135,18 @@ queryRewardMap (EpochNo epochNo) = do
131135
x : _ -> (fst x, List.sort $ map snd xs)
132136

133137
diffRewardMap ::
134-
Trace IO Text ->
138+
SyncEnv ->
135139
Network ->
136140
Map ByteString [(RewardSource, DbLovelace)] ->
137141
Map ByteString [(RewardSource, Coin)] ->
138142
IO ()
139-
diffRewardMap tracer _nw dbMap ledgerMap = do
143+
diffRewardMap syncEnv _nw dbMap ledgerMap = do
140144
when (Map.size diffMap > 0) $ do
141-
logError tracer "diffRewardMap:"
142-
mapM_ (logError tracer . render) $ Map.toList diffMap
145+
case ioShelley $ soptInsertOptions (envOptions syncEnv) of
146+
ShelleyStakeAddrs _ -> pure ()
147+
_ -> do
148+
logError tracer "diffRewardMap:"
149+
mapM_ (logError tracer . render) $ Map.toList diffMap
143150
where
144151
keys :: [ByteString]
145152
keys = List.nubOrd (Map.keys dbMap ++ Map.keys ledgerMap)
@@ -163,3 +170,5 @@ diffRewardMap tracer _nw dbMap ledgerMap = do
163170

164171
render :: (ByteString, ([(RewardSource, DbLovelace)], [(RewardSource, Coin)])) -> Text
165172
render (cred, (xs, ys)) = mconcat [" ", show cred, ": ", show xs, " /= ", show ys]
173+
174+
tracer = getTrace syncEnv

0 commit comments

Comments
 (0)