ndwarshuis
/
pwncash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX duplicated txs

This commit is contained in:
Nathan Dwarshuis 2023-08-13 12:11:33 -04:00
parent 7609171ab4
commit 3bf6df3b49
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Internal/Budget.hs
View File

@ -38,9 +38,8 @@ readBudget
(intAllos, _) <- combineError intAlloRes acntRes (,) (intAllos, _) <- combineError intAlloRes acntRes (,)
let res1 = mapErrors (readIncome c intAllos budgetSpan) bgtIncomes let res1 = mapErrors (readIncome c intAllos budgetSpan) bgtIncomes
let res2 = expandTransfers c budgetSpan bgtTransfers let res2 = expandTransfers c budgetSpan bgtTransfers
txs <- combineError (concat <$> res1) res2 (++) combineErrorM (concat <$> res1) res2 $ \is ts ->
shadow <- addShadowTransfers bgtShadowTransfers txs addShadowTransfers bgtShadowTransfers (is ++ ts)
return $ txs ++ shadow
where where
c = CommitR (CommitHash $ hash b) CTBudget c = CommitR (CommitHash $ hash b) CTBudget
acntRes = mapErrors isNotIncomeAcnt alloAcnts acntRes = mapErrors isNotIncomeAcnt alloAcnts

1
lib/Internal/Database.hs
View File

@ -81,6 +81,7 @@ sync pool root c bs hs = do
liftIO $ print $ length $ coRead history liftIO $ print $ length $ coRead history
liftIO $ print $ length $ coUpdate history liftIO $ print $ length $ coUpdate history
liftIO $ print $ (\(DeleteTxs e a b c' d) -> (length e, length a, length b, length c', length d)) $ coDelete history liftIO $ print $ (\(DeleteTxs e a b c' d) -> (length e, length a, length b, length c', length d)) $ coDelete history
liftIO $ print $ fmap (length . snd) $ coCreate budgets'
-- liftIO $ print $ length $ M.elems $ tsAccountMap txState -- liftIO $ print $ length $ M.elems $ tsAccountMap txState
-- liftIO $ print $ length $ M.elems $ tsCurrencyMap txState -- liftIO $ print $ length $ M.elems $ tsCurrencyMap txState
-- liftIO $ print $ length $ M.elems $ tsTagMap txState -- liftIO $ print $ length $ M.elems $ tsTagMap txState