formatting

Author: markspanbroek

codex/codex.nim

@@ -109,9 +109,8 @@ proc bootstrapInteractions(s: CodexServer): Future[void] {.async.} =
       quit QuitFailure
 
     let marketplace = Marketplace.new(marketplaceAddress, signer)
-    without market =? await OnChainMarket.load(
-      marketplace, config.marketplaceRequestCacheSize
-    ), error:
+    without market =?
+      await OnChainMarket.load(marketplace, config.marketplaceRequestCacheSize), error:
       fatal "Cannot load market", error = error.msg
       quit QuitFailure
 

codex/contracts/market.nim

@@ -51,13 +51,10 @@ proc load*(
 
   var requestCache = newLruCache[string, StorageRequest](int(requestCacheSize))
 
-  let market = OnChainMarket(
-    contract: contract,
-    signer: signer,
-    requestCache: requestCache,
-  )
+  let market =
+    OnChainMarket(contract: contract, signer: signer, requestCache: requestCache)
 
-  market.configuration = ? await market.loadConfig()
+  market.configuration = ?await market.loadConfig()
 
   return success market
 
@@ -114,7 +111,7 @@ method periodicity*(market: OnChainMarket): Periodicity =
   let period = market.configuration.proofs.period
   return Periodicity(seconds: period)
 
-method proofTimeout*(market: OnChainMarket): StorageDuration  =
+method proofTimeout*(market: OnChainMarket): StorageDuration =
   return market.configuration.proofs.timeout
 
 method repairRewardPercentage*(market: OnChainMarket): uint8 =

codex/contracts/marketplace.nim

@@ -55,9 +55,7 @@ type
 
 proc configuration*(marketplace: Marketplace): MarketplaceConfig {.contract, view.}
 proc token*(marketplace: Marketplace): Address {.contract, view.}
-proc currentCollateral*(
-  marketplace: Marketplace, id: SlotId
-): Tokens {.contract, view.}
+proc currentCollateral*(marketplace: Marketplace, id: SlotId): Tokens {.contract, view.}
 
 proc requestStorage*(
   marketplace: Marketplace, request: StorageRequest

codex/contracts/periods.nim

@@ -1,9 +1,8 @@
 import ../clock
 import ./requests
 
-type
-  Periodicity* = object
-    seconds*: StorageDuration
+type Periodicity* = object
+  seconds*: StorageDuration
 
 func periodOf*(periodicity: Periodicity, timestamp: StorageTimestamp): ProofPeriod =
   ProofPeriod.init(timestamp.u40 div periodicity.seconds.u40)

codex/contracts/timestamps.nim

@@ -6,8 +6,10 @@ from ../clock import SecondsSince1970
 type
   StorageTimestamp* = object
     value: StUint[40]
+
   StorageDuration* = object
     value: StUint[40]
+
   ProofPeriod* = object
     value: StUint[40]
 
@@ -43,7 +45,7 @@ func `'StorageDuration`*(value: static string): StorageDuration =
   StorageDuration(value: parsed)
 
 func `'StorageTimestamp`*(value: static string): StorageTimestamp =
-  const parsed =parse(value, StUint[40])
+  const parsed = parse(value, StUint[40])
   StorageTimestamp(value: parsed)
 
 func init*(_: type StorageDuration, value: StUint[40]): StorageDuration =
@@ -158,11 +160,10 @@ func `%`*(value: StorageDuration | StorageTimestamp | ProofPeriod): JsonNode =
   %value.value
 
 func fromJson*(_: type StorageDuration, json: JsonNode): ?!StorageDuration =
-  success StorageDuration(value: ? StUint[40].fromJson(json))
+  success StorageDuration(value: ?StUint[40].fromJson(json))
 
 func fromJson*(_: type StorageTimestamp, json: JsonNode): ?!StorageTimestamp =
-  success StorageTimestamp(value: ? StUint[40].fromJson(json))
+  success StorageTimestamp(value: ?StUint[40].fromJson(json))
 
 func fromJson*(_: type ProofPeriod, json: JsonNode): ?!ProofPeriod =
-  success ProofPeriod(value: ? StUint[40].fromJson(json))
-
+  success ProofPeriod(value: ?StUint[40].fromJson(json))

codex/contracts/tokens.nim

@@ -6,6 +6,7 @@ import ./timestamps
 type
   TokensPerSecond* = object
     value: StUint[96]
+
   Tokens* = object
     value: StUint[128]
 
@@ -101,8 +102,7 @@ func `%`*(value: TokensPerSecond | Tokens): JsonNode =
   %value.value
 
 func fromJson*(_: type TokensPerSecond, json: JsonNode): ?!TokensPerSecond =
-  success TokensPerSecond(value: ? StUint[96].fromJson(json))
+  success TokensPerSecond(value: ?StUint[96].fromJson(json))
 
 func fromJson*(_: type Tokens, json: JsonNode): ?!Tokens =
-  success Tokens(value: ? UInt128.fromJson(json))
-
+  success Tokens(value: ?UInt128.fromJson(json))

codex/market.nim

@@ -21,8 +21,9 @@ type
   SlotStateMismatchError* = object of MarketError
   SlotReservationNotAllowedError* = object of MarketError
   Subscription* = ref object of RootObj
-  OnRequest* =
-    proc(id: RequestId, ask: StorageAsk, expiry: StorageTimestamp) {.gcsafe, upraises: [].}
+  OnRequest* = proc(id: RequestId, ask: StorageAsk, expiry: StorageTimestamp) {.
+    gcsafe, upraises: []
+  .}
   OnFulfillment* = proc(requestId: RequestId) {.gcsafe, upraises: [].}
   OnSlotFilled* = proc(requestId: RequestId, slotIndex: uint64) {.gcsafe, upraises: [].}
   OnSlotFreed* = proc(requestId: RequestId, slotIndex: uint64) {.gcsafe, upraises: [].}
@@ -65,19 +66,21 @@ method getSigner*(
 ): Future[Address] {.base, async: (raises: [CancelledError, MarketError]).} =
   raiseAssert("not implemented")
 
-method zkeyHash*(market: Market): string {.base, gcsafe, raises:[].} =
+method zkeyHash*(market: Market): string {.base, gcsafe, raises: [].} =
   raiseAssert("not implemented")
 
-method periodicity*(market: Market): Periodicity {.base, gcsafe, raises:[].} =
+method periodicity*(market: Market): Periodicity {.base, gcsafe, raises: [].} =
   raiseAssert("not implemented")
 
-method proofTimeout*(market: Market): StorageDuration {.base, gcsafe, raises:[].} =
+method proofTimeout*(market: Market): StorageDuration {.base, gcsafe, raises: [].} =
   raiseAssert("not implemented")
 
-method repairRewardPercentage*(market: Market): uint8 {.base, gcsafe, raises:[].} =
+method repairRewardPercentage*(market: Market): uint8 {.base, gcsafe, raises: [].} =
   raiseAssert("not implemented")
 
-method requestDurationLimit*(market: Market): StorageDuration {.base, gcsafe, raises:[].} =
+method requestDurationLimit*(
+    market: Market
+): StorageDuration {.base, gcsafe, raises: [].} =
   raiseAssert("not implemented")
 
 method proofDowntime*(market: Market): uint8 {.base, gcsafe, raises: [].} =

codex/sales.nim

@@ -341,9 +341,9 @@ proc onSlotFreed(sales: Sales, requestId: RequestId, slotIndex: uint64) =
 
       without slotQueueItem =?
         SlotQueueItem.init(request, slotIndex.uint16, collateral, repairReward).catch,
-          err:
-          warn "Too many slots, cannot add to queue", error = err.msgDetail
-          return
+        err:
+        warn "Too many slots, cannot add to queue", error = err.msgDetail
+        return
 
       if err =? queue.push(slotQueueItem).errorOption:
         if err of SlotQueueItemExistsError:

codex/sales/salescontext.nim

@@ -30,7 +30,7 @@ type
     expiry: StorageTimestamp,
     slot: uint64,
     blocksCb: BlocksCb,
-    isRepairing: bool
+    isRepairing: bool,
   ): Future[?!void] {.gcsafe, upraises: [].}
   OnProve* = proc(slot: Slot, challenge: ProofChallenge): Future[?!Groth16Proof] {.
     gcsafe, upraises: []

codex/sales/slotqueue.nim

@@ -173,7 +173,9 @@ proc init*(
     repairReward = 0'Tokens,
     seen = false,
 ): SlotQueueItem =
-  SlotQueueItem.init(requestId, slotIndex, ask, some expiry, collateral, repairReward, seen)
+  SlotQueueItem.init(
+    requestId, slotIndex, ask, some expiry, collateral, repairReward, seen
+  )
 
 proc init*(
     _: type SlotQueueItem,
@@ -188,7 +190,7 @@ proc init*(
     slotSize: request.ask.slotSize,
     duration: request.ask.duration,
     pricePerBytePerSecond: request.ask.pricePerBytePerSecond,
-    collateral: collateral
+    collateral: collateral,
   )
 
 proc init(