Reverts logging-proxy, commit 27f585e

codex.nim

@@ -7,6 +7,7 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
+import pkg/chronicles
 import pkg/chronos
 import pkg/questionable
 import pkg/confutils
@@ -20,11 +21,10 @@ import pkg/libp2p
 
 import ./codex/conf
 import ./codex/codex
-import ./codex/logutils
 import ./codex/units
 import ./codex/utils/keyutils
 
-export codex, conf, libp2p, chronos, logutils
+export codex, conf, libp2p, chronos, chronicles
 
 when isMainModule:
   import std/sequtils

codex/blockexchange/engine/discovery.nim

@@ -10,21 +10,22 @@
 import std/sequtils
 
 import pkg/chronos
+import pkg/chronicles
 import pkg/libp2p/cid
 import pkg/metrics
 import pkg/questionable
 import pkg/questionable/results
 
-import ./pendingblocks
-
 import ../protobuf/presence
+
 import ../network
 import ../peers
 
 import ../../utils
 import ../../discovery
 import ../../stores/blockstore
-import ../../logutils
+
+import ./pendingblocks
 
 logScope:
   topics = "codex discoveryengine"

codex/blockexchange/engine/engine.nim

@@ -14,6 +14,7 @@ import std/algorithm
 import std/sugar
 
 import pkg/chronos
+import pkg/chronicles
 import pkg/libp2p/[cid, switch, multihash, multicodec]
 import pkg/metrics
 import pkg/stint
@@ -22,7 +23,6 @@ import ../../stores/blockstore
 import ../../blocktype
 import ../../utils
 import ../../merkletree
-import ../../logutils
 
 import ../protobuf/blockexc
 import ../protobuf/presence

codex/blockexchange/engine/pendingblocks.nim

@@ -14,6 +14,7 @@ import pkg/upraises
 
 push: {.upraises: [].}
 
+import pkg/chronicles
 import pkg/chronos
 import pkg/libp2p
 import pkg/metrics
@@ -22,7 +23,6 @@ import pkg/questionable/results
 import ../protobuf/blockexc
 import ../../blocktype
 import ../../merkletree
-import ../../logutils
 
 logScope:
   topics = "codex pendingblocks"

codex/blockexchange/network/network.nim

@@ -10,6 +10,7 @@
 import std/tables
 import std/sequtils
 
+import pkg/chronicles
 import pkg/chronos
 
 import pkg/libp2p
@@ -18,7 +19,6 @@ import pkg/questionable
 import pkg/questionable/results
 
 import ../../blocktype as bt
-import ../../logutils
 import ../protobuf/blockexc as pb
 import ../protobuf/payments
 

codex/blockexchange/network/networkpeer.nim

@@ -11,12 +11,12 @@ import pkg/upraises
 push: {.upraises: [].}
 
 import pkg/chronos
+import pkg/chronicles
 import pkg/libp2p
 
 import ../protobuf/blockexc
 import ../protobuf/message
 import ../../errors
-import ../../logutils
 
 logScope:
   topics = "codex blockexcnetworkpeer"

codex/blockexchange/peers/peercontext.nim

@@ -12,6 +12,7 @@ import std/tables
 import std/sugar
 import std/sets
 
+import pkg/chronicles
 import pkg/libp2p
 import pkg/chronos
 import pkg/nitro
@@ -22,7 +23,6 @@ import ../protobuf/payments
 import ../protobuf/presence
 
 import ../../blocktype
-import ../../logutils
 
 export payments, nitro
 

codex/blockexchange/peers/peerctxstore.nim

@@ -16,12 +16,11 @@ import pkg/upraises
 push: {.upraises: [].}
 
 import pkg/chronos
+import pkg/chronicles
 import pkg/libp2p
 
 import ../protobuf/blockexc
 import ../../blocktype
-import ../../logutils
-
 
 import ./peercontext
 export peercontext

codex/blocktype.nim

@@ -19,14 +19,15 @@ import pkg/libp2p/[cid, multicodec, multihash]
 import pkg/stew/byteutils
 import pkg/questionable
 import pkg/questionable/results
+import pkg/chronicles
+import pkg/json_serialization
 
 import ./units
 import ./utils
+import ./formats
 import ./errors
-import ./logutils
-import ./utils/json
 
-export errors, logutils, units
+export errors, formats, units
 
 const
   # Size of blocks for storage / network exchange,
@@ -41,18 +42,11 @@ type
   BlockAddress* = object
     case leaf*: bool
     of true:
-      treeCid* {.serialize.}: Cid
-      index* {.serialize.}: Natural
+      treeCid*: Cid
+      index*: Natural
     else:
-      cid* {.serialize.}: Cid
+      cid*: Cid
 
-logutils.formatIt(LogFormat.textLines, BlockAddress):
-  if it.leaf:
-    "treeCid: " & shortLog($it.treeCid) & ", index: " & $it.index
-  else:
-    "cid: " & shortLog($it.cid)
-
-logutils.formatIt(LogFormat.json, BlockAddress): %it
 
 proc `==`*(a, b: BlockAddress): bool =
   a.leaf == b.leaf and
@@ -69,6 +63,12 @@ proc `$`*(a: BlockAddress): string =
   else:
     "cid: " & $a.cid
 
+proc writeValue*(
+  writer: var JsonWriter,
+  value: Cid
+) {.upraises:[IOError].} =
+  writer.writeValue($value)
+
 proc cidOrTreeCid*(a: BlockAddress): Cid =
   if a.leaf:
     a.treeCid

codex/chunker.nim

@@ -13,13 +13,13 @@ import pkg/upraises
 
 push: {.upraises: [].}
 
+import pkg/chronicles
 import pkg/questionable
 import pkg/questionable/results
 import pkg/chronos
 import pkg/libp2p except shuffle
 
 import ./blocktype
-import ./logutils
 
 export blocktype
 

codex/codex.nim

@@ -12,6 +12,7 @@ import std/strutils
 import std/os
 import std/tables
 
+import pkg/chronicles
 import pkg/chronos
 import pkg/presto
 import pkg/libp2p
@@ -38,7 +39,6 @@ import ./contracts/clock
 import ./contracts/deployment
 import ./utils/addrutils
 import ./namespaces
-import ./logutils
 
 logScope:
   topics = "codex node"

codex/conf.nim

@@ -18,6 +18,7 @@ import std/strutils
 import std/typetraits
 
 import pkg/chronos
+import pkg/chronicles
 import pkg/chronicles/helpers
 import pkg/chronicles/topics_registry
 import pkg/confutils/defs
@@ -34,7 +35,6 @@ import pkg/questionable
 import pkg/questionable/results
 
 import ./discovery
-import ./logutils
 import ./stores
 import ./units
 import ./utils
@@ -53,7 +53,7 @@ type
     noCommand,
     initNode
 
-  LogKind* {.pure.} = enum
+  LogKind* = enum
     Auto = "auto"
     Colors = "colors"
     NoColors = "nocolors"
@@ -276,9 +276,6 @@ type
 
   EthAddress* = ethers.Address
 
-logutils.formatIt(LogFormat.textLines, EthAddress): it.short0xHexLog
-logutils.formatIt(LogFormat.json, EthAddress): %it
-
 proc getCodexVersion(): string =
   let tag = strip(staticExec("git tag"))
   if tag.isEmptyOrWhitespace:
@@ -410,7 +407,7 @@ proc completeCmdArg*(T: type Duration; val: string): seq[string] =
   discard
 
 # silly chronicles, colors is a compile-time property
-proc stripAnsi*(v: string): string =
+proc stripAnsi(v: string): string =
   var
     res = newStringOfCap(v.len)
     i: int

codex/contracts/deployment.nim

@@ -1,10 +1,11 @@
+import std/json
 import std/os
 import std/tables
 import pkg/ethers
 import pkg/questionable
+import pkg/chronicles
 
 import ../conf
-import ../logutils
 import ./marketplace
 
 type Deployment* = ref object

codex/contracts/interactions/clientinteractions.nim

@@ -1,13 +1,13 @@
 import pkg/ethers
+import pkg/chronicles
 
 import ../../purchasing
-import ../../logutils
 import ../market
 import ../clock
 import ./interactions
 
 export purchasing
-export logutils
+export chronicles except toJson
 
 type
   ClientInteractions* = ref object of ContractInteractions

codex/contracts/interactions/hostinteractions.nim

@@ -1,11 +1,11 @@
-import pkg/chronos
+import pkg/ethers
+import pkg/chronicles
 
-import ../../logutils
 import ../../sales
 import ./interactions
 
 export sales
-export logutils
+export chronicles except toJson
 
 type
   HostInteractions* = ref object of ContractInteractions

codex/contracts/market.nim

@@ -1,11 +1,11 @@
 import std/sequtils
 import std/strutils
 import std/sugar
+import pkg/chronicles
 import pkg/ethers
 import pkg/ethers/testing
 import pkg/upraises
 import pkg/questionable
-import ../logutils
 import ../market
 import ./marketplace
 

codex/contracts/requests.nim

@@ -1,13 +1,12 @@
 import std/hashes
-import std/sequtils
 import std/typetraits
 import pkg/contractabi
 import pkg/nimcrypto
 import pkg/ethers/fields
 import pkg/questionable/results
 import pkg/stew/byteutils
+import pkg/json_serialization
 import pkg/upraises
-import ../logutils
 import ../utils/json
 
 export contractabi
@@ -80,13 +79,6 @@ proc toHex*[T: distinct](id: T): string =
   type baseType = T.distinctBase
   baseType(id).toHex
 
-logutils.formatIt(LogFormat.textLines, Nonce): it.short0xHexLog
-logutils.formatIt(LogFormat.textLines, RequestId): it.short0xHexLog
-logutils.formatIt(LogFormat.textLines, SlotId): it.short0xHexLog
-logutils.formatIt(LogFormat.json, Nonce): it.to0xHexLog
-logutils.formatIt(LogFormat.json, RequestId): it.to0xHexLog
-logutils.formatIt(LogFormat.json, SlotId): it.to0xHexLog
-
 func fromTuple(_: type StorageRequest, tupl: tuple): StorageRequest =
   StorageRequest(
     client: tupl[0],
@@ -184,3 +176,17 @@ func price*(request: StorageRequest): UInt256 =
 
 func size*(ask: StorageAsk): UInt256 =
   ask.slots.u256 * ask.slotSize
+
+proc writeValue*(
+  writer: var JsonWriter,
+  value: SlotId | RequestId) {.upraises:[IOError].} =
+
+  mixin writeValue
+  writer.writeValue value.toArray
+
+proc readValue*[T: SlotId | RequestId](
+  reader: var JsonReader,
+  value: var T) {.upraises: [SerializationError, IOError].} =
+
+  mixin readValue
+  value = T reader.readValue(T.distinctBase)

codex/discovery.nim

@@ -11,6 +11,7 @@ import std/algorithm
 import std/sequtils
 
 import pkg/chronos
+import pkg/chronicles
 import pkg/libp2p/[cid, multicodec, routing_record, signed_envelope]
 import pkg/questionable
 import pkg/questionable/results
@@ -20,7 +21,7 @@ import pkg/codexdht/discv5/protocol as discv5
 
 import ./rng
 import ./errors
-import ./logutils
+import ./formats
 
 export discv5