From 2be296ed58985833d7dd864f6e3c4d23d611b8af Mon Sep 17 00:00:00 2001 From: E M <5089238+emizzle@users.noreply.github.com> Date: Wed, 18 Feb 2026 18:49:12 +1100 Subject: [PATCH] formatting # Conflicts: # storage/rest/api.nim # storage/storage.nim --- .../requests/node_debug_request.nim | 17 +++++++------- storage/rest/api.nim | 13 +++++------ tests/integration/5_minutes/testrestapi.nim | 18 +++++++-------- tests/integration/storageclient.nim | 22 +++++++++---------- .../blockexchange/engine/testblockexc.nim | 18 +++++++-------- tests/storage/node/helpers.nim | 7 +++--- tests/storage/testlogutils.nim | 9 ++++---- tests/storage/testnat.nim | 22 +++++++++---------- tests/storage/utils/testutils.nim | 13 +++++------ 9 files changed, 65 insertions(+), 74 deletions(-) diff --git a/library/storage_thread_requests/requests/node_debug_request.nim b/library/storage_thread_requests/requests/node_debug_request.nim index 4a7ac4c6..8bf3106c 100644 --- a/library/storage_thread_requests/requests/node_debug_request.nim +++ b/library/storage_thread_requests/requests/node_debug_request.nim @@ -52,15 +52,14 @@ proc getDebug( let node = storage[].node let table = RestRoutingTable.init(node.discovery.protocol.routingTable) - let json = - %*{ - "id": $node.switch.peerInfo.peerId, - "addrs": node.switch.peerInfo.addrs.mapIt($it), - "spr": - if node.discovery.dhtRecord.isSome: node.discovery.dhtRecord.get.toURI else: "", - "announceAddresses": node.discovery.announceAddrs, - "table": table, - } + let json = %*{ + "id": $node.switch.peerInfo.peerId, + "addrs": node.switch.peerInfo.addrs.mapIt($it), + "spr": + if node.discovery.dhtRecord.isSome: node.discovery.dhtRecord.get.toURI else: "", + "announceAddresses": node.discovery.announceAddrs, + "table": table, + } return ok($json) diff --git a/storage/rest/api.nim b/storage/rest/api.nim index 47497b61..8a809301 100644 --- a/storage/rest/api.nim +++ b/storage/rest/api.nim @@ -375,13 +375,12 @@ proc initDataApi(node: StorageNodeRef, repoStore: RepoStore, router: var RestRou return RestApiResponse.response($json, contentType = "application/json") router.api(MethodGet, "/api/storage/v1/space") do() -> RestApiResponse: - let json = - %RestRepoStore( - totalBlocks: repoStore.totalBlocks, - quotaMaxBytes: repoStore.quotaMaxBytes, - quotaUsedBytes: repoStore.quotaUsedBytes, - quotaReservedBytes: repoStore.quotaReservedBytes, - ) + let json = %RestRepoStore( + totalBlocks: repoStore.totalBlocks, + quotaMaxBytes: repoStore.quotaMaxBytes, + quotaUsedBytes: repoStore.quotaUsedBytes, + quotaReservedBytes: repoStore.quotaReservedBytes, + ) return RestApiResponse.response($json, contentType = "application/json") proc initNodeApi(node: StorageNodeRef, conf: StorageConf, router: var RestRouter) = diff --git a/tests/integration/5_minutes/testrestapi.nim b/tests/integration/5_minutes/testrestapi.nim index cb7e4ff4..fde9a8ce 100644 --- a/tests/integration/5_minutes/testrestapi.nim +++ b/tests/integration/5_minutes/testrestapi.nim @@ -58,11 +58,10 @@ twonodessuite "REST API": check (await response.body) != "" test "node retrieve the metadata", twoNodesConfig: - let headers = - @[ - ("Content-Type", "text/plain"), - ("Content-Disposition", "attachment; filename=\"example.txt\""), - ] + let headers = @[ + ("Content-Type", "text/plain"), + ("Content-Disposition", "attachment; filename=\"example.txt\""), + ] let uploadResponse = await client1.uploadRaw("some file contents", headers) let cid = await uploadResponse.body let listResponse = await client1.listRaw() @@ -83,11 +82,10 @@ twonodessuite "REST API": check manifest["mimetype"].getStr() == "text/plain" test "node set the headers when for download", twoNodesConfig: - let headers = - @[ - ("Content-Disposition", "attachment; filename=\"example.txt\""), - ("Content-Type", "text/plain"), - ] + let headers = @[ + ("Content-Disposition", "attachment; filename=\"example.txt\""), + ("Content-Type", "text/plain"), + ] let uploadResponse = await client1.uploadRaw("some file contents", headers) let cid = await uploadResponse.body diff --git a/tests/integration/storageclient.nim b/tests/integration/storageclient.nim index dc90cedf..15c78c29 100644 --- a/tests/integration/storageclient.nim +++ b/tests/integration/storageclient.nim @@ -33,17 +33,17 @@ proc request( async: (raw: true, raises: [CancelledError, HttpError]) .} = HttpClientRequestRef - .new( - self.session, - url, - httpMethod, - version = HttpVersion11, - flags = {}, - maxResponseHeadersSize = HttpMaxHeadersSize, - headers = headers, - body = body.toOpenArrayByte(0, len(body) - 1), - ).get - .send() + .new( + self.session, + url, + httpMethod, + version = HttpVersion11, + flags = {}, + maxResponseHeadersSize = HttpMaxHeadersSize, + headers = headers, + body = body.toOpenArrayByte(0, len(body) - 1), + ).get + .send() proc post*( self: StorageClient, diff --git a/tests/storage/blockexchange/engine/testblockexc.nim b/tests/storage/blockexchange/engine/testblockexc.nim index d61fcf94..515236bf 100644 --- a/tests/storage/blockexchange/engine/testblockexc.nim +++ b/tests/storage/blockexchange/engine/testblockexc.nim @@ -57,14 +57,14 @@ asyncchecksuite "NetworkStore engine - 2 nodes": check: (await allFinished(blocks1[0 .. 3].mapIt(nodeCmps2.localStore.getBlock(it.cid)))) - .filterIt(it.completed and it.read.isOk) - .mapIt($it.read.get.cid) - .sorted(cmp[string]) == blocks1[0 .. 3].mapIt($it.cid).sorted(cmp[string]) + .filterIt(it.completed and it.read.isOk) + .mapIt($it.read.get.cid) + .sorted(cmp[string]) == blocks1[0 .. 3].mapIt($it.cid).sorted(cmp[string]) (await allFinished(blocks2[0 .. 3].mapIt(nodeCmps1.localStore.getBlock(it.cid)))) - .filterIt(it.completed and it.read.isOk) - .mapIt($it.read.get.cid) - .sorted(cmp[string]) == blocks2[0 .. 3].mapIt($it.cid).sorted(cmp[string]) + .filterIt(it.completed and it.read.isOk) + .mapIt($it.read.get.cid) + .sorted(cmp[string]) == blocks2[0 .. 3].mapIt($it.cid).sorted(cmp[string]) test "Should send want-have for block": let blk = bt.Block.new("Block 1".toBytes).tryGet() @@ -138,9 +138,9 @@ asyncchecksuite "NetworkStore - multiple nodes": check: (await allFinished(downloadCids.mapIt(downloader.localStore.getBlock(it)))) - .filterIt(it.completed and it.read.isOk) - .mapIt($it.read.get.cid) - .sorted(cmp[string]) == downloadCids.mapIt($it).sorted(cmp[string]) + .filterIt(it.completed and it.read.isOk) + .mapIt($it.read.get.cid) + .sorted(cmp[string]) == downloadCids.mapIt($it).sorted(cmp[string]) test "Should exchange blocks with multiple nodes": let diff --git a/tests/storage/node/helpers.nim b/tests/storage/node/helpers.nim index de840d7c..00a87c97 100644 --- a/tests/storage/node/helpers.nim +++ b/tests/storage/node/helpers.nim @@ -97,10 +97,9 @@ template setupAndTearDown*() {.dirty.} = blockDiscovery = Discovery.new( switch.peerInfo.privateKey, - announceAddrs = - @[ - MultiAddress.init("/ip4/127.0.0.1/tcp/0").expect("Should return multiaddress") - ], + announceAddrs = @[ + MultiAddress.init("/ip4/127.0.0.1/tcp/0").expect("Should return multiaddress") + ], ) peerStore = PeerCtxStore.new() pendingBlocks = PendingBlocksManager.new() diff --git a/tests/storage/testlogutils.nim b/tests/storage/testlogutils.nim index 36959552..1918137f 100644 --- a/tests/storage/testlogutils.nim +++ b/tests/storage/testlogutils.nim @@ -205,11 +205,10 @@ checksuite "Test logging output": check loggedJson("ma", "\"/ip4/127.0.0.1/tcp/0\"") test "logs seq[MultiAddress] correctly": - let ma = - @[ - MultiAddress.init("/ip4/127.0.0.1/tcp/0").tryGet, - MultiAddress.init("/ip4/127.0.0.2/tcp/1").tryGet, - ] + let ma = @[ + MultiAddress.init("/ip4/127.0.0.1/tcp/0").tryGet, + MultiAddress.init("/ip4/127.0.0.2/tcp/1").tryGet, + ] log ma check logged("ma", "\"@[/ip4/127.0.0.1/tcp/0, /ip4/127.0.0.2/tcp/1]\"") check loggedJson("ma", "[\"/ip4/127.0.0.1/tcp/0\",\"/ip4/127.0.0.2/tcp/1\"]") diff --git a/tests/storage/testnat.nim b/tests/storage/testnat.nim index ce774b52..d8539cb5 100644 --- a/tests/storage/testnat.nim +++ b/tests/storage/testnat.nim @@ -22,18 +22,16 @@ suite "NAT Address Tests": # Expected results let - expectedDiscoveryAddrs = - @[ - MultiAddress.init("/ip4/8.8.8.8/udp/1234").expect("valid multiaddr"), - MultiAddress.init("/ip4/8.8.8.8/udp/1234").expect("valid multiaddr"), - MultiAddress.init("/ip4/8.8.8.8/udp/1234").expect("valid multiaddr"), - ] - expectedlibp2pAddrs = - @[ - MultiAddress.init("/ip4/8.8.8.8/tcp/5000").expect("valid multiaddr"), - MultiAddress.init("/ip4/8.8.8.8/tcp/5000").expect("valid multiaddr"), - MultiAddress.init("/ip4/8.8.8.8/tcp/5000").expect("valid multiaddr"), - ] + expectedDiscoveryAddrs = @[ + MultiAddress.init("/ip4/8.8.8.8/udp/1234").expect("valid multiaddr"), + MultiAddress.init("/ip4/8.8.8.8/udp/1234").expect("valid multiaddr"), + MultiAddress.init("/ip4/8.8.8.8/udp/1234").expect("valid multiaddr"), + ] + expectedlibp2pAddrs = @[ + MultiAddress.init("/ip4/8.8.8.8/tcp/5000").expect("valid multiaddr"), + MultiAddress.init("/ip4/8.8.8.8/tcp/5000").expect("valid multiaddr"), + MultiAddress.init("/ip4/8.8.8.8/tcp/5000").expect("valid multiaddr"), + ] #ipv6Addr = MultiAddress.init("/ip6/::1/tcp/5000").expect("valid multiaddr") addrs = @[localAddr, anyAddr, publicAddr] diff --git a/tests/storage/utils/testutils.nim b/tests/storage/utils/testutils.nim index 56ffdea8..306dccbc 100644 --- a/tests/storage/utils/testutils.nim +++ b/tests/storage/utils/testutils.nim @@ -7,13 +7,12 @@ suite "findIt": type AnObject = object attribute1*: int - var objList = - @[ - AnObject(attribute1: 1), - AnObject(attribute1: 3), - AnObject(attribute1: 5), - AnObject(attribute1: 3), - ] + var objList = @[ + AnObject(attribute1: 1), + AnObject(attribute1: 3), + AnObject(attribute1: 5), + AnObject(attribute1: 3), + ] test "should retur index of first object matching predicate": assert objList.findIt(it.attribute1 == 3) == 1