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

Make the default network for portalcli the history network (#1195)

This commit is contained in:
Kim De Mey 2022-08-23 16:28:10 +02:00 committed by GitHub
parent fe54f93ab6
commit 55dcbe9e58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fluffy/tools/portalcli.nim
View File

@ -16,7 +16,7 @@ import
../common/common_utils, ../common/common_utils,
../content_db, ../content_db,
../network/wire/[portal_protocol, portal_stream], ../network/wire/[portal_protocol, portal_stream],
../network/state/[state_content, state_network] ../network/history/[history_content, history_network]
const const
defaultListenAddress* = (static ValidIpAddress.init("0.0.0.0")) defaultListenAddress* = (static ValidIpAddress.init("0.0.0.0"))
@ -102,7 +102,7 @@ type
name: "metrics-port" .}: Port name: "metrics-port" .}: Port
protocolId* {. protocolId* {.
defaultValue: stateProtocolId defaultValue: historyProtocolId
desc: "Portal wire protocol id for the network to connect to" desc: "Portal wire protocol id for the network to connect to"
name: "protocol-id" .}: PortalProtocolId name: "protocol-id" .}: PortalProtocolId
@ -200,11 +200,9 @@ proc testContentIdHandler(contentKey: ByteList): Option[ContentId] =
proc dbGetHandler(db: ContentDB, contentKey: ByteList): proc dbGetHandler(db: ContentDB, contentKey: ByteList):
(Option[ContentId], Option[seq[byte]]) = (Option[ContentId], Option[seq[byte]]) =
let contentIdOpt = contentKey.toContentId() let contentId = contentKey.toContentId()
if contentIdOpt.isSome():
(contentIdOpt, db.get(contentIdOpt.get())) (some(contentId), db.get(contentId))
else:
(contentIdOpt, none(seq[byte]))
proc run(config: PortalCliConf) = proc run(config: PortalCliConf) =
let let

2
nimbus.nimble
View File

@ -69,7 +69,7 @@ task fluffy, "Build fluffy":
buildBinary "fluffy", "fluffy/", "-d:chronicles_log_level=TRACE -d:chronosStrictException -d:PREFER_BLST_SHA256=false" buildBinary "fluffy", "fluffy/", "-d:chronicles_log_level=TRACE -d:chronosStrictException -d:PREFER_BLST_SHA256=false"
task fluffy_tools, "Build fluffy tools": task fluffy_tools, "Build fluffy tools":
buildBinary "portalcli", "fluffy/tools/", "-d:chronicles_log_level=TRACE -d:chronosStrictException" buildBinary "portalcli", "fluffy/tools/", "-d:chronicles_log_level=TRACE -d:chronosStrictException -d:PREFER_BLST_SHA256=false"
buildBinary "blockwalk", "fluffy/tools/", "-d:chronicles_log_level=TRACE -d:chronosStrictException" buildBinary "blockwalk", "fluffy/tools/", "-d:chronicles_log_level=TRACE -d:chronosStrictException"
buildBinary "eth_data_exporter", "fluffy/tools/", "-d:chronicles_log_level=TRACE -d:chronosStrictException -d:PREFER_BLST_SHA256=false" buildBinary "eth_data_exporter", "fluffy/tools/", "-d:chronicles_log_level=TRACE -d:chronosStrictException -d:PREFER_BLST_SHA256=false"