From f4f4ff9ade2bd752e071f9acd1eff9cbe6888103 Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Fri, 27 Aug 2021 15:39:08 -0600 Subject: [PATCH] rename bitswap and move to stores --- dagger.nim | 49 ------------ dagger/bitswap.nim | 78 +++++++++---------- dagger/stores/memorystore.nim | 2 +- dagger/{bitswap => stores/network}/engine.nim | 63 ++++++++------- .../network}/engine/payments.nim | 4 +- .../{bitswap => stores/network}/network.nim | 75 +++++++++--------- .../network}/networkpeer.nim | 8 +- .../network}/peercontext.nim | 12 +-- .../network}/pendingblocks.nim | 4 +- .../network/protobuf/blockexc.nim} | 0 .../network}/protobuf/message.proto | 15 ++-- .../network}/protobuf/message.proto.license | 0 .../network}/protobuf/payments.nim | 2 +- .../network}/protobuf/presence.nim | 4 +- nim.cfg | 2 +- tests/dagger/dataset.nim | 20 ----- 16 files changed, 132 insertions(+), 206 deletions(-) rename dagger/{bitswap => stores/network}/engine.nim (85%) rename dagger/{bitswap => stores/network}/engine/payments.nim (91%) rename dagger/{bitswap => stores/network}/network.nim (84%) rename dagger/{bitswap => stores/network}/networkpeer.nim (93%) rename dagger/{bitswap => stores/network}/peercontext.nim (76%) rename dagger/{bitswap => stores/network}/pendingblocks.nim (94%) rename dagger/{bitswap/protobuf/bitswap.nim => stores/network/protobuf/blockexc.nim} (100%) rename dagger/{bitswap => stores/network}/protobuf/message.proto (74%) rename dagger/{bitswap => stores/network}/protobuf/message.proto.license (100%) rename dagger/{bitswap => stores/network}/protobuf/payments.nim (98%) rename dagger/{bitswap => stores/network}/protobuf/presence.nim (93%) delete mode 100644 tests/dagger/dataset.nim diff --git a/dagger.nim b/dagger.nim index 9fd5b5a9..e69de29b 100644 --- a/dagger.nim +++ b/dagger.nim @@ -1,49 +0,0 @@ -import pkg/chronos -import pkg/libp2p/peerinfo -import pkg/libp2p/multiaddress -import ./ipfs/p2p/switch -import ./ipfs/repo -import ./ipfs/chunking -import ./ipfs/bitswap - -export peerinfo except IPFS -export multiaddress except IPFS - -type - Ipfs* = ref object - repo: Repo - switch: Switch - bitswap: Bitswap - -proc info*(ipfs: Ipfs): PeerInfo = - ipfs.switch.peerInfo - -proc start*(_: type Ipfs, addresses: seq[MultiAddress]): Future[Ipfs] {.async.} = - let repo = Repo() - let switch = Switch.create() - let bitswap = Bitswap.start(switch, repo) - switch.peerInfo.addrs.add(addresses) - discard await switch.start() - result = Ipfs(repo: repo, switch: switch, bitswap: bitswap) - -proc start*(_: type Ipfs, address: MultiAddress): Future[Ipfs] {.async.} = - result = await Ipfs.start(@[address]) - -proc start*(_: type Ipfs): Future[Ipfs] {.async.} = - result = await Ipfs.start(@[]) - -proc connect*(peer: Ipfs, info: PeerInfo) {.async.} = - await peer.bitswap.connect(info) - -proc add*(peer: Ipfs, input: File): Future[Cid] {.async.} = - let obj = createObject(input) - peer.repo.store(obj) - result = obj.cid - -proc get*(peer: Ipfs, identifier: Cid, output: File) {.async.} = - let obj = await peer.bitswap.retrieve(identifier) - if obj.isSome: - obj.get().writeToFile(output) - -proc stop*(peer: Ipfs) {.async.} = - await peer.switch.stop() diff --git a/dagger/bitswap.nim b/dagger/bitswap.nim index e09529fe..ed4fafed 100644 --- a/dagger/bitswap.nim +++ b/dagger/bitswap.nim @@ -14,18 +14,18 @@ import pkg/chronos import pkg/libp2p import pkg/libp2p/errors -import ./bitswap/protobuf/bitswap as pb +import ./blockexc/protobuf/blockexc as pb import ./blocktype as bt import ./stores/blockstore import ./utils/asyncheapqueue -import ./bitswap/network -import ./bitswap/engine +import ./blockexc/network +import ./blockexc/engine export network, blockstore, asyncheapqueue, engine logScope: - topics = "dagger bitswap" + topics = "dagger blockexc" const DefaultTaskQueueSize = 100 @@ -33,58 +33,58 @@ const DefaultMaxRetries = 3 type - Bitswap* = ref object of BlockStore - engine*: BitswapEngine # bitswap decision engine - taskQueue*: AsyncHeapQueue[BitswapPeerCtx] # peers we're currently processing tasks for - bitswapTasks: seq[Future[void]] # future to control bitswap task - bitswapRunning: bool # indicates if the bitswap task is running + BlockExc* = ref object of BlockStore + engine*: BlockExcEngine # blockexc decision engine + taskQueue*: AsyncHeapQueue[BlockExcPeerCtx] # peers we're currently processing tasks for + blockexcTasks: seq[Future[void]] # future to control blockexc task + blockexcRunning: bool # indicates if the blockexc task is running concurrentTasks: int # number of concurrent peers we're serving at any given time maxRetries: int # max number of tries for a failed block taskHandler: TaskHandler # handler provided by the engine called by the runner -proc bitswapTaskRunner(b: Bitswap) {.async.} = +proc blockexcTaskRunner(b: BlockExc) {.async.} = ## process tasks ## - while b.bitswapRunning: + while b.blockexcRunning: let peerCtx = await b.taskQueue.pop() asyncSpawn b.taskHandler(peerCtx) - trace "Exiting bitswap task runner" + trace "Exiting blockexc task runner" -proc start*(b: Bitswap) {.async.} = - ## Start the bitswap task +proc start*(b: BlockExc) {.async.} = + ## Start the blockexc task ## - trace "bitswap start" + trace "blockexc start" - if b.bitswapTasks.len > 0: - warn "Starting bitswap twice" + if b.blockexcTasks.len > 0: + warn "Starting blockexc twice" return - b.bitswapRunning = true + b.blockexcRunning = true for i in 0.. 0: b.request.sendPresence(task.id, wants) -proc new*( - T: type BitswapEngine, +func new*( + T: type BlockExcEngine, localStore: BlockStore, wallet: WalletRef, - request: BitswapRequest = BitswapRequest(), + request: BlockExcRequest = BlockExcRequest(), scheduleTask: TaskScheduler = nil, peersPerRequest = DefaultMaxPeersPerRequest): T = - proc taskScheduler(task: BitswapPeerCtx): bool = + proc taskScheduler(task: BlockExcPeerCtx): bool = if not isNil(scheduleTask): return scheduleTask(task) - let b = BitswapEngine( + let b = BlockExcEngine( localStore: localStore, pendingBlocks: PendingBlocksManager.new(), peersPerRequest: peersPerRequest, diff --git a/dagger/bitswap/engine/payments.nim b/dagger/stores/network/engine/payments.nim similarity index 91% rename from dagger/bitswap/engine/payments.nim rename to dagger/stores/network/engine/payments.nim index 0beecc86..08718fcc 100644 --- a/dagger/bitswap/engine/payments.nim +++ b/dagger/stores/network/engine/payments.nim @@ -18,7 +18,7 @@ func openLedgerChannel*(wallet: WalletRef, asset: EthAddress): ?!ChannelId = wallet.openLedgerChannel(hub, ChainId, asset, AmountPerChannel) -func getOrOpenChannel(wallet: WalletRef, peer: BitswapPeerCtx): ?!ChannelId = +func getOrOpenChannel(wallet: WalletRef, peer: BlockExcPeerCtx): ?!ChannelId = if channel =? peer.paymentChannel: success channel elif account =? peer.account: @@ -29,7 +29,7 @@ func getOrOpenChannel(wallet: WalletRef, peer: BitswapPeerCtx): ?!ChannelId = failure "no account set for peer" func pay*(wallet: WalletRef, - peer: BitswapPeerCtx, + peer: BlockExcPeerCtx, amount: UInt256): ?!SignedState = if account =? peer.account: let asset = Asset diff --git a/dagger/bitswap/network.nim b/dagger/stores/network/network.nim similarity index 84% rename from dagger/bitswap/network.nim rename to dagger/stores/network/network.nim index f71b0098..75cf1866 100644 --- a/dagger/bitswap/network.nim +++ b/dagger/stores/network/network.nim @@ -17,7 +17,7 @@ import pkg/questionable import pkg/questionable/results import ../blocktype as bt -import ./protobuf/bitswap as pb +import ./protobuf/blockexc import ./protobuf/payments import ./networkpeer @@ -25,9 +25,9 @@ export pb, networkpeer export payments logScope: - topics = "dagger bitswap network" + topics = "dagger blockexc network" -const Codec* = "/ipfs/bitswap/1.2.0" +const Codec* = "/dagger/blockexc/1.0.0" type WantListHandler* = proc(peer: PeerID, wantList: WantList) {.gcsafe.} @@ -36,7 +36,7 @@ type AccountHandler* = proc(peer: PeerID, account: Account) {.gcsafe.} PaymentHandler* = proc(peer: PeerID, payment: SignedState) {.gcsafe.} - BitswapHandlers* = object + BlockExcHandlers* = object onWantList*: WantListHandler onBlocks*: BlocksHandler onPresence*: BlockPresenceHandler @@ -57,22 +57,22 @@ type AccountBroadcaster* = proc(peer: PeerID, account: Account) {.gcsafe.} PaymentBroadcaster* = proc(peer: PeerID, payment: SignedState) {.gcsafe.} - BitswapRequest* = object + BlockExcRequest* = object sendWantList*: WantListBroadcaster sendBlocks*: BlocksBroadcaster sendPresence*: PresenceBroadcaster sendAccount*: AccountBroadcaster sendPayment*: PaymentBroadcaster - BitswapNetwork* = ref object of LPProtocol + BlockExcNetwork* = ref object of LPProtocol peers*: Table[PeerID, NetworkPeer] switch*: Switch - handlers*: BitswapHandlers - request*: BitswapRequest + handlers*: BlockExcHandlers + request*: BlockExcRequest getConn: ConnProvider proc handleWantList( - b: BitswapNetwork, + b: BlockExcNetwork, peer: NetworkPeer, list: WantList) = ## Handle incoming want list @@ -104,7 +104,7 @@ proc makeWantList*( WantList(entries: entries, full: full) proc broadcastWantList*( - b: BitswapNetwork, + b: BlockExcNetwork, id: PeerID, cids: seq[Cid], priority: int32 = 0, @@ -130,7 +130,7 @@ proc broadcastWantList*( asyncSpawn b.peers[id].send(Message(wantlist: wantList)) proc handleBlocks( - b: BitswapNetwork, + b: BlockExcNetwork, peer: NetworkPeer, blocks: seq[auto]) = ## Handle incoming blocks @@ -159,7 +159,6 @@ template makeBlocks*( seq[pb.Block] = var blks: seq[pb.Block] for blk in blocks: - # for now only send bitswap `1.1.0` blks.add(pb.Block( prefix: blk.cid.data.buffer, data: blk.data @@ -168,7 +167,7 @@ template makeBlocks*( blks proc broadcastBlocks*( - b: BitswapNetwork, + b: BlockExcNetwork, id: PeerID, blocks: seq[bt.Block]) = ## Send blocks to remote @@ -181,7 +180,7 @@ proc broadcastBlocks*( asyncSpawn b.peers[id].send(pb.Message(payload: makeBlocks(blocks))) proc handleBlockPresence( - b: BitswapNetwork, + b: BlockExcNetwork, peer: NetworkPeer, presence: seq[BlockPresence]) = ## Handle block presence @@ -194,7 +193,7 @@ proc handleBlockPresence( b.handlers.onPresence(peer.id, presence) proc broadcastBlockPresence*( - b: BitswapNetwork, + b: BlockExcNetwork, id: PeerID, presence: seq[BlockPresence]) = ## Send presence to remote @@ -206,14 +205,14 @@ proc broadcastBlockPresence*( trace "Sending presence to peer", peer = id asyncSpawn b.peers[id].send(Message(blockPresences: presence)) -proc handleAccount(network: BitswapNetwork, +proc handleAccount(network: BlockExcNetwork, peer: NetworkPeer, account: Account) = if network.handlers.onAccount.isNil: return network.handlers.onAccount(peer.id, account) -proc broadcastAccount*(network: BitswapNetwork, +proc broadcastAccount*(network: BlockExcNetwork, id: PeerId, account: Account) = if id notin network.peers: @@ -222,7 +221,7 @@ proc broadcastAccount*(network: BitswapNetwork, let message = Message(account: AccountMessage.init(account)) asyncSpawn network.peers[id].send(message) -proc broadcastPayment*(network: BitswapNetwork, +proc broadcastPayment*(network: BlockExcNetwork, id: PeerId, payment: SignedState) = if id notin network.peers: @@ -231,14 +230,14 @@ proc broadcastPayment*(network: BitswapNetwork, let message = Message(payment: StateChannelUpdate.init(payment)) asyncSpawn network.peers[id].send(message) -proc handlePayment(network: BitswapNetwork, +proc handlePayment(network: BlockExcNetwork, peer: NetworkPeer, payment: SignedState) = if network.handlers.onPayment.isNil: return network.handlers.onPayment(peer.id, payment) -proc rpcHandler(b: BitswapNetwork, peer: NetworkPeer, msg: Message) {.async.} = +proc rpcHandler(b: BlockExcNetwork, peer: NetworkPeer, msg: Message) {.async.} = try: if msg.wantlist.entries.len > 0: b.handleWantList(peer, msg.wantlist) @@ -259,10 +258,10 @@ proc rpcHandler(b: BitswapNetwork, peer: NetworkPeer, msg: Message) {.async.} = b.handlePayment(peer, payment) except CatchableError as exc: - trace "Exception in bitswap rpc handler", exc = exc.msg + trace "Exception in blockexc rpc handler", exc = exc.msg -proc getOrCreatePeer(b: BitswapNetwork, peer: PeerID): NetworkPeer = - ## Creates or retrieves a BitswapNetwork Peer +proc getOrCreatePeer(b: BlockExcNetwork, peer: PeerID): NetworkPeer = + ## Creates or retrieves a BlockExcNetwork Peer ## if peer in b.peers: @@ -272,7 +271,7 @@ proc getOrCreatePeer(b: BitswapNetwork, peer: PeerID): NetworkPeer = try: return await b.switch.dial(peer, Codec) except CatchableError as exc: - trace "unable to connect to bitswap peer", exc = exc.msg + trace "unable to connect to blockexc peer", exc = exc.msg if not isNil(b.getConn): getConn = b.getConn @@ -281,27 +280,27 @@ proc getOrCreatePeer(b: BitswapNetwork, peer: PeerID): NetworkPeer = b.rpcHandler(p, msg) # create new pubsub peer - let bitSwapPeer = NetworkPeer.new(peer, getConn, rpcHandler) - debug "created new bitswap peer", peer + let blockExcPeer = NetworkPeer.new(peer, getConn, rpcHandler) + debug "created new blockexc peer", peer - b.peers[peer] = bitSwapPeer + b.peers[peer] = blockExcPeer - return bitSwapPeer + return blockExcPeer -proc setupPeer*(b: BitswapNetwork, peer: PeerID) = +proc setupPeer*(b: BlockExcNetwork, peer: PeerID) = ## Perform initial setup, such as want ## list exchange ## discard b.getOrCreatePeer(peer) -proc dropPeer*(b: BitswapNetwork, peer: PeerID) = +proc dropPeer*(b: BlockExcNetwork, peer: PeerID) = ## Cleanup disconnected peer ## b.peers.del(peer) -method init*(b: BitswapNetwork) = +method init*(b: BlockExcNetwork) = ## Perform protocol initialization ## @@ -320,20 +319,20 @@ method init*(b: BitswapNetwork) = proc handle(conn: Connection, proto: string) {.async, gcsafe, closure.} = let peerId = conn.peerInfo.peerId - let bitswapPeer = b.getOrCreatePeer(peerId) - await bitswapPeer.readLoop(conn) # attach read loop + let blockexcPeer = b.getOrCreatePeer(peerId) + await blockexcPeer.readLoop(conn) # attach read loop b.handler = handle b.codec = Codec -proc new*( - T: type BitswapNetwork, +func new*( + T: type BlockExcNetwork, switch: Switch, connProvider: ConnProvider = nil): T = - ## Create a new BitswapNetwork instance + ## Create a new BlockExcNetwork instance ## - let b = BitswapNetwork( + let b = BlockExcNetwork( switch: switch, getConn: connProvider) @@ -361,7 +360,7 @@ proc new*( proc sendPayment(id: PeerID, payment: SignedState) = b.broadcastPayment(id, payment) - b.request = BitswapRequest( + b.request = BlockExcRequest( sendWantList: sendWantList, sendBlocks: sendBlocks, sendPresence: sendPresence, diff --git a/dagger/bitswap/networkpeer.nim b/dagger/stores/network/networkpeer.nim similarity index 93% rename from dagger/bitswap/networkpeer.nim rename to dagger/stores/network/networkpeer.nim index aae8fd91..7e011021 100644 --- a/dagger/bitswap/networkpeer.nim +++ b/dagger/stores/network/networkpeer.nim @@ -12,10 +12,10 @@ import pkg/chronicles import pkg/protobuf_serialization import pkg/libp2p -import ./protobuf/bitswap +import ./protobuf/blockexc logScope: - topics = "dagger bitswap networkpeer" + topics = "dagger blockexc networkpeer" const MaxMessageSize = 8 * 1024 * 1024 @@ -43,7 +43,7 @@ proc readLoop*(b: NetworkPeer, conn: Connection) {.async.} = trace "Got message for peer", peer = b.id, msg await b.handler(b, msg) except CatchableError as exc: - trace "Exception in bitswap read loop", exc = exc.msg + trace "Exception in blockexc read loop", exc = exc.msg finally: await conn.close() @@ -65,7 +65,7 @@ proc send*(b: NetworkPeer, msg: Message) {.async.} = trace "Sending message to remote", peer = b.id, msg = $msg await conn.writeLp(Protobuf.encode(msg)) -proc new*( +func new*( T: type NetworkPeer, peer: PeerId, connProvider: ConnProvider, diff --git a/dagger/bitswap/peercontext.nim b/dagger/stores/network/peercontext.nim similarity index 76% rename from dagger/bitswap/peercontext.nim rename to dagger/stores/network/peercontext.nim index 74fcd909..d01a92eb 100644 --- a/dagger/bitswap/peercontext.nim +++ b/dagger/stores/network/peercontext.nim @@ -4,7 +4,7 @@ import pkg/libp2p import pkg/chronos import pkg/nitro import pkg/questionable -import ./protobuf/bitswap +import ./protobuf/blockexc import ./protobuf/payments import ./protobuf/presence @@ -12,7 +12,7 @@ export payments export nitro type - BitswapPeerCtx* = ref object of RootObj + BlockExcPeerCtx* = ref object of RootObj id*: PeerID peerPrices*: Table[Cid, UInt256] # remote peer have list including price peerWants*: seq[Entry] # remote peers want lists @@ -21,16 +21,16 @@ type account*: ?Account # ethereum account of this peer paymentChannel*: ?ChannelId # payment channel id -proc peerHave*(context: BitswapPeerCtx): seq[Cid] = +proc peerHave*(context: BlockExcPeerCtx): seq[Cid] = toSeq(context.peerPrices.keys) -proc contains*(a: openArray[BitswapPeerCtx], b: PeerID): bool = +proc contains*(a: openArray[BlockExcPeerCtx], b: PeerID): bool = ## Convenience method to check for peer prepense ## a.anyIt( it.id == b ) -func updatePresence*(context: BitswapPeerCtx, presence: Presence) = +func updatePresence*(context: BlockExcPeerCtx, presence: Presence) = let cid = presence.cid let price = presence.price @@ -39,7 +39,7 @@ func updatePresence*(context: BitswapPeerCtx, presence: Presence) = elif cid in context.peerHave and not presence.have: context.peerPrices.del(cid) -func price*(context: BitswapPeerCtx, cids: seq[Cid]): UInt256 = +func price*(context: BlockExcPeerCtx, cids: seq[Cid]): UInt256 = for cid in cids: if price =? context.peerPrices.?[cid]: result += price diff --git a/dagger/bitswap/pendingblocks.nim b/dagger/stores/network/pendingblocks.nim similarity index 94% rename from dagger/bitswap/pendingblocks.nim rename to dagger/stores/network/pendingblocks.nim index af1973e1..b783c0d1 100644 --- a/dagger/bitswap/pendingblocks.nim +++ b/dagger/stores/network/pendingblocks.nim @@ -16,7 +16,7 @@ import pkg/libp2p import ../blocktype logScope: - topics = "dagger bitswap pendingblocks" + topics = "dagger blockexc pendingblocks" type PendingBlocksManager* = ref object of RootObj @@ -67,7 +67,7 @@ proc contains*( p: PendingBlocksManager, cid: Cid): bool = p.pending(cid) -proc new*(T: type PendingBlocksManager): T = +func new*(T: type PendingBlocksManager): T = T( blocks: initTable[Cid, Future[Block]]() ) diff --git a/dagger/bitswap/protobuf/bitswap.nim b/dagger/stores/network/protobuf/blockexc.nim similarity index 100% rename from dagger/bitswap/protobuf/bitswap.nim rename to dagger/stores/network/protobuf/blockexc.nim diff --git a/dagger/bitswap/protobuf/message.proto b/dagger/stores/network/protobuf/message.proto similarity index 74% rename from dagger/bitswap/protobuf/message.proto rename to dagger/stores/network/protobuf/message.proto index ac8b4e88..48a4ea36 100644 --- a/dagger/bitswap/protobuf/message.proto +++ b/dagger/stores/network/protobuf/message.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package bitswap.message.pb; +package blockexc.message.pb; message Message { @@ -11,7 +11,7 @@ message Message { } message Entry { - bytes block = 1; // the block cid (cidV0 in bitswap 1.0.0, cidV1 in bitswap 1.1.0) + bytes block = 1; // the block cid int32 priority = 2; // the priority (normalized). default to 1 bool cancel = 3; // whether this revokes an entry WantType wantType = 4; // Note: defaults to enum 0, ie Block @@ -47,10 +47,9 @@ message Message { } Wantlist wantlist = 1; - repeated bytes blocks = 2; // used to send Blocks in bitswap 1.0.0 - repeated Block payload = 3; // used to send Blocks in bitswap 1.1.0 - repeated BlockPresence blockPresences = 4; - int32 pendingBytes = 5; - AccountMessage account = 6; - StateChannelUpdate payment = 7; + repeated Block payload = 2; + repeated BlockPresence blockPresences = 3; + int32 pendingBytes = 4; + AccountMessage account = 5; + StateChannelUpdate payment = 6; } diff --git a/dagger/bitswap/protobuf/message.proto.license b/dagger/stores/network/protobuf/message.proto.license similarity index 100% rename from dagger/bitswap/protobuf/message.proto.license rename to dagger/stores/network/protobuf/message.proto.license diff --git a/dagger/bitswap/protobuf/payments.nim b/dagger/stores/network/protobuf/payments.nim similarity index 98% rename from dagger/bitswap/protobuf/payments.nim rename to dagger/stores/network/protobuf/payments.nim index 078b5f61..bf1ee0f2 100644 --- a/dagger/bitswap/protobuf/payments.nim +++ b/dagger/stores/network/protobuf/payments.nim @@ -4,7 +4,7 @@ import pkg/stint import pkg/nitro import pkg/questionable import pkg/upraises -import ./bitswap +import ./blockexc export AccountMessage export StateChannelUpdate diff --git a/dagger/bitswap/protobuf/presence.nim b/dagger/stores/network/protobuf/presence.nim similarity index 93% rename from dagger/bitswap/protobuf/presence.nim rename to dagger/stores/network/protobuf/presence.nim index af8a4fb7..cc53edcb 100644 --- a/dagger/bitswap/protobuf/presence.nim +++ b/dagger/stores/network/protobuf/presence.nim @@ -3,7 +3,7 @@ import pkg/stint import pkg/questionable import pkg/questionable/results import pkg/upraises -import ./bitswap +import ./blockexc export questionable export stint @@ -12,7 +12,7 @@ export BlockPresenceType upraises.push: {.upraises: [].} type - PresenceMessage* = bitswap.BlockPresence + PresenceMessage* = blockexc.BlockPresence Presence* = object cid*: Cid have*: bool diff --git a/nim.cfg b/nim.cfg index 2ecd6221..3fe1adb5 100644 --- a/nim.cfg +++ b/nim.cfg @@ -1 +1 @@ --d:"chronicles_enabled=off" # disable logging by default +-d:"chronicles_enabled=on" # disable logging by default diff --git a/tests/dagger/dataset.nim b/tests/dagger/dataset.nim deleted file mode 100644 index ab01ef03..00000000 --- a/tests/dagger/dataset.nim +++ /dev/null @@ -1,20 +0,0 @@ -import std/sequtils - -import pkg/chronos -import pkg/asynctest -import pkg/stew/results -import pkg/dagger/chunker -import pkg/dagger/merkletree -import pkg/stew/byteutils -import pkg/dagger/p2p/rng -import pkg/dagger/blocktype as bt - -suite "Data set": - - test "Make from Blocks": - let - chunker = newRandomChunker(Rng.instance(), size = 256*3, chunkSize = 256) - blocks = chunker.mapIt( bt.Block.new(it) ) - - let merkle = MerkleTreeRef.fromBlocks(blocks) -