Skip to content
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

compaction test txlogs #1780

Merged
merged 13 commits into from
Nov 16, 2023
Merged

compaction test txlogs #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
73dfba9
txlog test
chessai Nov 15, 2023
5d4d47a
more work
chessai Nov 15, 2023
e470ce6
Merge branch 'chessai/compaction' into chessai/compaction-test-txlogs
chessai Nov 16, 2023
b57758e
fix bench compile error
chessai Nov 16, 2023
1ba2cc4
txlogsTest
chessai Nov 16, 2023
b56a376
finished test
chessai Nov 16, 2023
c29b6c7
move aeson-pretty to proper place in chainweb-tests build-depends; ad…
chessai Nov 16, 2023
78954ac
fix MultiNode for TargetBlockHeight stuff
chessai Nov 16, 2023
7ecdfc9
Merge branch 'chessai/compaction' into chessai/compaction-test-txlogs
chessai Nov 16, 2023
40df59e
Merge branch 'chessai/compaction' into chessai/compaction-test-txlogs
chessai Nov 16, 2023
2e95c0b
Apply suggestions from self-review
chessai Nov 16, 2023
5de8d31
remove redundant txlog inequality checking
chessai Nov 16, 2023
ebe96f1
respond to review
chessai Nov 16, 2023
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
2 changes: 1 addition & 1 deletion chainweb.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ test-suite chainweb-tests

build-depends:
-- internal
chainweb
, chainweb
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oof

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i prefer leading commas for easy re-arranging (eg with vim's :sort u), but i can undo this. originally it was because i added a temporary dependency above this


-- external
, Decimal >= 0.4.2
Expand Down
2 changes: 1 addition & 1 deletion src/Chainweb/Chainweb/Configuration.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ defaultChainwebConfiguration v = ChainwebConfiguration
, _configP2p = defaultP2pConfiguration
, _configThrottling = defaultThrottlingConfig
, _configMempoolP2p = defaultEnableConfig defaultMempoolP2pConfig
, _configBlockGasLimit = 150000
, _configBlockGasLimit = 150_000
, _configLogGas = False
, _configMinGasPrice = 1e-8
, _configPactQueueSize = 2000
Expand Down
12 changes: 12 additions & 0 deletions src/Chainweb/Utils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,18 @@ instance HasTextRepresentation Integer where
fromText = treadM
{-# INLINE fromText #-}

instance HasTextRepresentation Word where
toText = sshow
{-# INLINE toText #-}
fromText = treadM
{-# INLINE fromText #-}

instance HasTextRepresentation Word64 where
toText = sshow
{-# INLINE toText #-}
fromText = treadM
{-# INLINE fromText #-}

instance HasTextRepresentation UTCTime where
toText = T.pack . formatTime defaultTimeLocale iso8601DateTimeFormat
{-# INLINE toText #-}
Expand Down
1 change: 0 additions & 1 deletion test/Chainweb/Test/Pact/PactSingleChainTest.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,6 @@ pactStateSamePreAndPostCompaction rdb =
putStrLn ""
assertFailure "pact state check failed"


compactionIsIdempotent :: ()
=> RocksDb
-> TestTree
Expand Down
Loading
Loading