diff --git a/dagger/bitswap/network.nim b/dagger/bitswap/network.nim index 2d52b925..ac4c48bb 100644 --- a/dagger/bitswap/network.nim +++ b/dagger/bitswap/network.nim @@ -13,12 +13,14 @@ import pkg/chronicles import pkg/chronos import pkg/libp2p +import pkg/nitro import ../blocktype as bt import ./protobuf/bitswap as pb import ./networkpeer export pb, networkpeer +export nitro logScope: topics = "dagger bitswap network" @@ -55,6 +57,7 @@ type BitswapNetwork* = ref object of LPProtocol peers*: Table[PeerID, NetworkPeer] switch*: Switch + wallet*: Wallet handlers*: BitswapHandlers request*: BitswapRequest getConn: ConnProvider @@ -273,12 +276,14 @@ method init*(b: BitswapNetwork) = proc new*( T: type BitswapNetwork, switch: Switch, + wallet: Wallet, connProvider: ConnProvider = nil): T = ## Create a new BitswapNetwork instance ## let b = BitswapNetwork( switch: switch, + wallet: wallet, getConn: connProvider) proc sendWantList( diff --git a/tests/dagger/bitswap/testbitswap.nim b/tests/dagger/bitswap/testbitswap.nim index 72709608..1a4f434c 100644 --- a/tests/dagger/bitswap/testbitswap.nim +++ b/tests/dagger/bitswap/testbitswap.nim @@ -27,6 +27,7 @@ suite "Bitswap engine - 2 nodes": var switch1, switch2: Switch + wallet1, wallet2: Wallet network1, network2: BitswapNetwork bitswap1, bitswap2: Bitswap awaiters: seq[Future[void]] @@ -39,17 +40,19 @@ suite "Bitswap engine - 2 nodes": switch1 = newStandardSwitch() switch2 = newStandardSwitch() + wallet1 = Wallet.init(EthPrivateKey.random()) + wallet2 = Wallet.init(EthPrivateKey.random()) awaiters.add(await switch1.start()) awaiters.add(await switch2.start()) peerId1 = switch1.peerInfo.peerId peerId2 = switch2.peerInfo.peerId - network1 = BitswapNetwork.new(switch = switch1) + network1 = BitswapNetwork.new(switch1, wallet1) bitswap1 = Bitswap.new(MemoryStore.new(blocks1), network1) switch1.mount(network1) - network2 = BitswapNetwork.new(switch = switch2) + network2 = BitswapNetwork.new(switch2, wallet2) bitswap2 = Bitswap.new(MemoryStore.new(blocks2), network2) switch2.mount(network2) diff --git a/tests/dagger/bitswap/testnetwork.nim b/tests/dagger/bitswap/testnetwork.nim index 20660bb4..412379cc 100644 --- a/tests/dagger/bitswap/testnetwork.nim +++ b/tests/dagger/bitswap/testnetwork.nim @@ -37,6 +37,7 @@ suite "Bitswap network": buffer = newBufferStream() network = BitswapNetwork.new( switch = newStandardSwitch(), + wallet = Wallet.init(EthPrivateKey.random()), connProvider = getConn) network.setupPeer(peerId) networkPeer = network.peers[peerId] @@ -108,6 +109,7 @@ suite "Bitswap Network - e2e": var switch1, switch2: Switch + wallet1, wallet2: Wallet network1, network2: BitswapNetwork awaiters: seq[Future[void]] done: Future[void] @@ -116,15 +118,15 @@ suite "Bitswap Network - e2e": done = newFuture[void]() switch1 = newStandardSwitch() switch2 = newStandardSwitch() + wallet1 = Wallet.init(EthPrivateKey.random()) + wallet2 = Wallet.init(EthPrivateKey.random()) awaiters.add(await switch1.start()) awaiters.add(await switch2.start()) - network1 = BitswapNetwork.new( - switch = switch1) + network1 = BitswapNetwork.new(switch1, wallet1) switch1.mount(network1) - network2 = BitswapNetwork.new( - switch = switch2) + network2 = BitswapNetwork.new(switch2, wallet2) switch2.mount(network2) await switch1.connect( diff --git a/tests/dagger/bitswap/utils.nim b/tests/dagger/bitswap/utils.nim index 9bf3d4b2..56fc9b1c 100644 --- a/tests/dagger/bitswap/utils.nim +++ b/tests/dagger/bitswap/utils.nim @@ -17,7 +17,8 @@ proc generateNodes*( for i in 0..