diff --git a/library/waku_thread/inter_thread_communication/requests/protocols/relay_request.nim b/library/waku_thread/inter_thread_communication/requests/protocols/relay_request.nim index 3315348bd..be0684bd1 100644 --- a/library/waku_thread/inter_thread_communication/requests/protocols/relay_request.nim +++ b/library/waku_thread/inter_thread_communication/requests/protocols/relay_request.nim @@ -96,7 +96,8 @@ proc process*(self: ptr RelayRequest, case self.operation: of SUBSCRIBE: - node.wakuRelay.subscribe($self.pubsubTopic, self.relayEventCallback) + # TO DO: properly perform 'subscribe' + discard node.wakuRelay.subscribe($self.pubsubTopic, self.relayEventCallback) of UNSUBSCRIBE: # TODO: properly perform 'unsubscribe' diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles index 1922045db..d1d34b949 160000 --- a/vendor/nim-chronicles +++ b/vendor/nim-chronicles @@ -1 +1 @@ -Subproject commit 1922045dbaa34c2fae86a32dda0e2ac56f1cf435 +Subproject commit d1d34b9490f99fa2052ffcff2bcf0edaf42d1bdd diff --git a/vendor/nim-chronos b/vendor/nim-chronos index 2e8551b0d..be2edab3a 160000 --- a/vendor/nim-chronos +++ b/vendor/nim-chronos @@ -1 +1 @@ -Subproject commit 2e8551b0d973cfbebfab3be7f3329e11b9049007 +Subproject commit be2edab3ac101da03a70cbf52bc3f3d972b35d91 diff --git a/vendor/nim-confutils b/vendor/nim-confutils index 674c9e4c8..7568f1b7c 160000 --- a/vendor/nim-confutils +++ b/vendor/nim-confutils @@ -1 +1 @@ -Subproject commit 674c9e4c8e0cad2b7193cc9a59c12d39a397750f +Subproject commit 7568f1b7c3142d8e87c1f3dd42924238926affbe diff --git a/vendor/nim-eth b/vendor/nim-eth index ac680ed79..700360fde 160000 --- a/vendor/nim-eth +++ b/vendor/nim-eth @@ -1 +1 @@ -Subproject commit ac680ed79bf9e4e78ca14a001eb7f78acdf7b07d +Subproject commit 700360fde2cf91c0c6d66af42851ee21c947e23a diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils index 87b7cbf03..4a46dcc4c 160000 --- a/vendor/nim-http-utils +++ b/vendor/nim-http-utils @@ -1 +1 @@ -Subproject commit 87b7cbf032c90b9e6b446081f4a647e950362cec +Subproject commit 4a46dcc4c0c6c4a53715602d4cfd47a032ab8582 diff --git a/vendor/nim-presto b/vendor/nim-presto index 81250a419..5ca16485e 160000 --- a/vendor/nim-presto +++ b/vendor/nim-presto @@ -1 +1 @@ -Subproject commit 81250a419bc097a9e93f2ab69de60543eee07138 +Subproject commit 5ca16485e4d74e531d50d289ebc0f869d9e6352b diff --git a/vendor/nim-regex b/vendor/nim-regex index f080b198e..577c4ec3b 160000 --- a/vendor/nim-regex +++ b/vendor/nim-regex @@ -1 +1 @@ -Subproject commit f080b198e21dc013551ade831bb0338871e03bc5 +Subproject commit 577c4ec3b235c5fd2653a9c86cbc4a576cfc0869 diff --git a/vendor/nim-serialization b/vendor/nim-serialization index 4bdbc29e5..543b2f3dd 160000 --- a/vendor/nim-serialization +++ b/vendor/nim-serialization @@ -1 +1 @@ -Subproject commit 4bdbc29e54fe54049950e352bb969aab97173b35 +Subproject commit 543b2f3dd0724f7cf631feba6c2a3ec438f3d230 diff --git a/vendor/nim-stint b/vendor/nim-stint index 54e24cae4..711cda445 160000 --- a/vendor/nim-stint +++ b/vendor/nim-stint @@ -1 +1 @@ -Subproject commit 54e24cae415b1bed39a987ecd08c19a34f740972 +Subproject commit 711cda4456c32d3ba3c6c4524135b3453dffeb9c diff --git a/vendor/nim-unicodedb b/vendor/nim-unicodedb index b055310c0..04a154eee 160000 --- a/vendor/nim-unicodedb +++ b/vendor/nim-unicodedb @@ -1 +1 @@ -Subproject commit b055310c08db8f879057b4fec15c8301ee93bb2a +Subproject commit 04a154eee0b8a2ad313e24ba46a4e5b4e0b9036f diff --git a/vendor/nim-unittest2 b/vendor/nim-unittest2 index 2300fa992..91973dfa3 160000 --- a/vendor/nim-unittest2 +++ b/vendor/nim-unittest2 @@ -1 +1 @@ -Subproject commit 2300fa9924a76e6c96bc4ea79d043e3a0f27120c +Subproject commit 91973dfa3823a8b423abdce59ac19de0a17ef9c1 diff --git a/vendor/nim-web3 b/vendor/nim-web3 index 70f22351c..428b931e7 160000 --- a/vendor/nim-web3 +++ b/vendor/nim-web3 @@ -1 +1 @@ -Subproject commit 70f22351c44b849a321b78b94dc0f9cd4ac9a5e1 +Subproject commit 428b931e7c4f1284b4272bc2c11fca2bd70991cd diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system index 81ce5fc75..6cdd14282 160000 --- a/vendor/nimbus-build-system +++ b/vendor/nimbus-build-system @@ -1 +1 @@ -Subproject commit 81ce5fc7521e400ceababde59b4a90fe7da8919d +Subproject commit 6cdd14282b7c813c2ae4b9a9d749c3ff5ce1b54a diff --git a/vendor/nimcrypto b/vendor/nimcrypto index 1c8d6e3ca..a079df924 160000 --- a/vendor/nimcrypto +++ b/vendor/nimcrypto @@ -1 +1 @@ -Subproject commit 1c8d6e3caf3abc572136ae9a1da81730c4eb4288 +Subproject commit a079df92424968d46a6ac258299ce9380aa153f2 diff --git a/waku/common/logging.nim b/waku/common/logging.nim index 669a2ee94..b8385a930 100644 --- a/waku/common/logging.nim +++ b/waku/common/logging.nim @@ -6,28 +6,17 @@ import chronicles/log_output, chronicles/topics_registry +export chronicles.LogLevel when (NimMajor, NimMinor) < (1, 4): {.push raises: [Defect].} else: {.push raises: [].} - type - LogLevel* = enum - TRACE, DEBUG, INFO, NOTICE, WARN, ERROR, FATAL - LogFormat* = enum TEXT, JSON -converter toChroniclesLogLevel(level: LogLevel): chronicles.LogLevel = - ## Map logging log levels to the corresponding nim-chronicles' log level - try: - parseEnum[chronicles.LogLevel]($level) - except CatchableError: - chronicles.LogLevel.NONE - - ## Utils proc stripAnsi(v: string): string = @@ -82,12 +71,12 @@ proc setupLogLevel*(level: LogLevel) = topics_registry.setLogLevel(level) proc setupLogFormat*(format: LogFormat, color=true) = - proc noOutputWriter(logLevel: chronicles.LogLevel, msg: LogOutputStr) = discard + proc noOutputWriter(logLevel: LogLevel, msg: LogOutputStr) = discard - proc stdoutOutputWriter(logLevel: chronicles.LogLevel, msg: LogOutputStr) = + proc stdoutOutputWriter(logLevel: LogLevel, msg: LogOutputStr) = writeAndFlush(io.stdout, msg) - proc stdoutNoColorOutputWriter(logLevel: chronicles.LogLevel, msg: LogOutputStr) = + proc stdoutNoColorOutputWriter(logLevel: LogLevel, msg: LogOutputStr) = writeAndFlush(io.stdout, stripAnsi(msg))