status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Run everything fluffy with chronosStrictException (#889)

This commit is contained in:
Kim De Mey 2021-11-18 17:52:44 +01:00 committed by GitHub
parent 78f585399f
commit 02afda1b45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nimbus.nimble
View File

@ -52,10 +52,12 @@ task nimbus, "Build Nimbus":
buildBinary "nimbus", "nimbus/", "-d:chronicles_log_level=TRACE" buildBinary "nimbus", "nimbus/", "-d:chronicles_log_level=TRACE"
task fluffy, "Build fluffy": task fluffy, "Build fluffy":
buildBinary "fluffy", "fluffy/", "-d:chronicles_log_level=TRACE" buildBinary "fluffy", "fluffy/", "-d:chronicles_log_level=TRACE -d:chronosStrictException"
task portalcli, "Build portalcli": task portalcli, "Build portalcli":
buildBinary "portalcli", "fluffy/tools/", "-d:chronicles_log_level=TRACE" buildBinary "portalcli", "fluffy/tools/", "-d:chronicles_log_level=TRACE -d:chronosStrictException"
task testfluffy, "Run fluffy tests": task testfluffy, "Run fluffy tests":
test "fluffy/tests", "all_fluffy_tests", "-d:chronicles_log_level=ERROR -d:nimbus_db_backend=sqlite" # Need the nimbus_db_backend in state network tests as we need a Hexary to
# start from, even though it only uses the MemoryDb.
test "fluffy/tests", "all_fluffy_tests", "-d:chronicles_log_level=ERROR -d:chronosStrictException -d:nimbus_db_backend=sqlite"

3
nimbus/chain_config.nim
View File

@ -159,7 +159,8 @@ template to(a: string, b: type UInt256): UInt256 =
# json_serialization decode table stuff # json_serialization decode table stuff
UInt256.fromHex(a) UInt256.fromHex(a)
proc loadNetworkParams*(fileName: string, cg: var NetworkParams): bool = proc loadNetworkParams*(fileName: string, cg: var NetworkParams):
bool {.raises: [Defect].} =
var cc: CustomChain var cc: CustomChain
try: try:
cc = Json.loadFile(fileName, CustomChain, allowUnknownFields = true) cc = Json.loadFile(fileName, CustomChain, allowUnknownFields = true)

3
nimbus/genesis.nim
View File

@ -5,7 +5,8 @@ import
./db/[db_chain, state_db], ./db/[db_chain, state_db],
"."/[constants, chain_config, forks, p2p/gaslimit] "."/[constants, chain_config, forks, p2p/gaslimit]
proc toBlock*(g: Genesis, db: BaseChainDB = nil): BlockHeader = proc toBlock*(g: Genesis, db: BaseChainDB = nil):
BlockHeader {.raises: [Defect, RlpError].} =
let (tdb, pruneTrie) = if db.isNil: (newMemoryDB(), true) let (tdb, pruneTrie) = if db.isNil: (newMemoryDB(), true)
else: (db.db, db.pruneTrie) else: (db.db, db.pruneTrie)
tdb.put(emptyRlpHash.data, emptyRlp) tdb.put(emptyRlpHash.data, emptyRlp)

2
vendor/nim-json-serialization vendored

@ -1 +1 @@
Subproject commit 297496d703a43cbbe00323abe7f0b7f8e320ff33 Subproject commit c5f0e2465e8375dfc7aa0f56ccef67cb680bc6b0