gets rid of ugly casts

Author: marcinczenko

codex/blockexchange/engine/advertiser.nim

@@ -99,13 +99,13 @@ proc advertiseLocalStoreLoop(b: Advertiser) {.async: (raises: []).} =
       if cidsIter =? await b.localStore.listBlocks(blockType = BlockType.Torrent):
         trace "Advertiser begins iterating torrent blocks..."
         for c in cidsIter:
-          if cid =? (await cast[Future[?!Cid].Raising([CancelledError])](c)):
+          if cid =? await c:
             await b.advertiseBlock(cid)
         trace "Advertiser iterating torrent blocks finished."
       if cidsIter =? await b.localStore.listBlocks(blockType = BlockType.Manifest):
         trace "Advertiser begins iterating blocks..."
         for c in cidsIter:
-          if cid =? (await cast[Future[?!Cid].Raising([CancelledError])](c)):
+          if cid =? await c:
             await b.advertiseBlock(cid)
         trace "Advertiser iterating blocks finished."
 

codex/node.nim

@@ -728,7 +728,7 @@ proc iterateManifests*(self: CodexNodeRef, onManifest: OnManifest) {.async.} =
     return
 
   for c in cidsIter:
-    if cid =? (await cast[Future[?!Cid].Raising([CancelledError])](c)):
+    if cid =? await c:
       without blk =? await self.networkStore.getBlock(cid):
         warn "Failed to get manifest block by cid", cid
         return

codex/rest/api.nim

@@ -204,8 +204,7 @@ proc retrieveInfoHash(
     torrentDownloader.start()
 
     for blockFut in torrentDownloader.getAsyncBlockIterator():
-      let blockRes =
-        await cast[Future[?!(int, seq[byte])].Raising([CancelledError])](blockFut)
+      let blockRes = await blockFut
       without (blockIndex, data) =? (blockRes), err:
         error "Error streaming blocks", err = err.msg
         resp.status = Http500

codex/stores/maintenance.nim

@@ -83,8 +83,7 @@ proc runBlockCheck(
 
   var numberReceived = 0
   for beFut in iter:
-    let beRes = await cast[Future[?!BlockExpiration].Raising([CancelledError])](beFut)
-    without be =? beRes, err:
+    without be =? (await beFut), err:
       trace "Unable to obtain blockExpiration from iterator"
       continue
     inc numberReceived

tests/codex/bittorrent/testtorrentdownloader.nim

@@ -14,6 +14,7 @@ import pkg/codex/bittorrent/manifest
 import pkg/codex/bittorrent/torrentdownloader
 
 import pkg/codex/utils/iter
+import pkg/codex/utils/safeasynciter
 import pkg/codex/logutils
 
 import ../../asynctest
@@ -208,6 +209,47 @@ asyncchecksuite "Torrent Downloader":
     check blockIter.finished
     await torrentDownloader.stop()
 
+  test "get downloaded blocks using async iter":
+    torrentDownloader.start()
+
+    let blockIter = Iter.new(0 ..< codexManifest.blocksCount)
+
+    for dataFut in torrentDownloader.getAsyncBlockIterator():
+      let status = await dataFut.withTimeout(1.seconds)
+      assert status == true
+      let (blockIndex, data) = (await dataFut).tryGet()
+      trace "got data", blockIndex, len = data.len
+      let expectedBlockIndex = blockIter.next()
+      check blockIndex == expectedBlockIndex
+      let treeCid = codexManifest.treeCid
+      let address = BlockAddress.init(treeCid, expectedBlockIndex)
+      let blk = (await localStore.getBlock(address)).tryGet()
+      check blk.data == data
+
+    check blockIter.finished
+    await torrentDownloader.stop()
+
+  test "get downloaded blocks using async pairs iter":
+    torrentDownloader.start()
+
+    let blockIter = Iter.new(0 ..< codexManifest.blocksCount)
+
+    for i, dataFut in torrentDownloader.getAsyncBlockIterator():
+      let status = await dataFut.withTimeout(1.seconds)
+      assert status == true
+      let (blockIndex, data) = (await dataFut).tryGet()
+      trace "got data", blockIndex, len = data.len
+      let expectedBlockIndex = blockIter.next()
+      check i == expectedBlockIndex
+      check blockIndex == expectedBlockIndex
+      let treeCid = codexManifest.treeCid
+      let address = BlockAddress.init(treeCid, expectedBlockIndex)
+      let blk = (await localStore.getBlock(address)).tryGet()
+      check blk.data == data
+
+    check blockIter.finished
+    await torrentDownloader.stop()
+
   test "canceling download":
     torrentDownloader.start()
 

tests/codex/stores/commonstoretests.nim

@@ -110,7 +110,7 @@ proc commonBlockStoreTests*(
 
       var count = 0
       for c in cidsIter:
-        if cid =? (await cast[Future[?!Cid].Raising([CancelledError])](c)):
+        if cid =? await c:
           check (await store.hasBlock(cid)).tryGet()
           count.inc
 
@@ -134,7 +134,7 @@ proc commonBlockStoreTests*(
 
       var count = 0
       for c in cidsIter:
-        if cid =? (await cast[Future[?!Cid].Raising([CancelledError])](c)):
+        if cid =? await c:
           check manifestBlock.cid == cid
           check (await store.hasBlock(cid)).tryGet()
           count.inc
@@ -159,7 +159,7 @@ proc commonBlockStoreTests*(
 
       var count = 0
       for c in cidsIter:
-        if cid =? (await cast[Future[?!Cid].Raising([CancelledError])](c)):
+        if cid =? await c:
           check (await store.hasBlock(cid)).tryGet()
           count.inc
 

tests/codex/stores/testrepostore.nim

@@ -293,16 +293,13 @@ asyncchecksuite "RepoStore":
 
   test "Should retrieve block expiration information":
     proc unpack(
-        beIter: Future[?!SafeAsyncIter[BlockExpiration]]
+        beIter: auto
     ): Future[seq[BlockExpiration]] {.async: (raises: [CancelledError]).} =
       var expirations = newSeq[BlockExpiration](0)
-      without iter =? (
-        await cast[Future[?!SafeAsyncIter[BlockExpiration]].Raising([CancelledError])](beIter)
-      ), err:
+      without iter =? (await beIter), err:
         return expirations
       for beFut in toSeq(iter):
-        if value =?
-            (await cast[Future[?!BlockExpiration].Raising([CancelledError])](beFut)):
+        if value =? (await beFut):
           expirations.add(value)
       return expirations