Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit dc03ebf

Browse files
hannahhowardhannahhoward
committed
refactor(testinstance): rename instance generator
Instance generator was previously named session generator, which created confusion with bitswap sessions fix #101
1 parent d2705cd commit dc03ebf

File tree

4 files changed

+84
-84
lines changed

4 files changed

+84
-84
lines changed

‎benchmarks_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ func subtestDistributeAndFetch(b *testing.B, numnodes, numblks int, d delay.D, d
148148
start := time.Now()
149149
net := tn.VirtualNetwork(mockrouting.NewServer(), d)
150150

151-
sg := testinstance.NewTestSessionGenerator(net)
152-
defer sg.Close()
151+
ig := testinstance.NewTestInstanceGenerator(net)
152+
defer ig.Close()
153153

154154
bg := blocksutil.NewBlockGenerator()
155155

156-
instances := sg.Instances(numnodes)
156+
instances := ig.Instances(numnodes)
157157
blocks := bg.Blocks(numblks)
158158
runDistribution(b, instances, blocks, df, ff, start)
159159
}
@@ -162,10 +162,10 @@ func subtestDistributeAndFetchRateLimited(b *testing.B, numnodes, numblks int, d
162162
start := time.Now()
163163
net := tn.RateLimitedVirtualNetwork(mockrouting.NewServer(), d, rateLimitGenerator)
164164

165-
sg := testinstance.NewTestSessionGenerator(net)
166-
defer sg.Close()
165+
ig := testinstance.NewTestInstanceGenerator(net)
166+
defer ig.Close()
167167

168-
instances := sg.Instances(numnodes)
168+
instances := ig.Instances(numnodes)
169169
blocks := testutil.GenerateBlocksOfSize(numblks, blockSize)
170170

171171
runDistribution(b, instances, blocks, df, ff, start)

‎bitswap_test.go

+40-40
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ func getVirtualNetwork() tn.Network {
3636

3737
func TestClose(t *testing.T) {
3838
vnet := getVirtualNetwork()
39-
sesgen := testinstance.NewTestSessionGenerator(vnet)
40-
defer sesgen.Close()
39+
ig := testinstance.NewTestInstanceGenerator(vnet)
40+
defer ig.Close()
4141
bgen := blocksutil.NewBlockGenerator()
4242

4343
block := bgen.Next()
44-
bitswap := sesgen.Next()
44+
bitswap := ig.Next()
4545

4646
bitswap.Exchange.Close()
4747
bitswap.Exchange.GetBlock(context.Background(), block.Cid())
@@ -51,14 +51,14 @@ func TestProviderForKeyButNetworkCannotFind(t *testing.T) { // TODO revisit this
5151

5252
rs := mockrouting.NewServer()
5353
net := tn.VirtualNetwork(rs, delay.Fixed(kNetworkDelay))
54-
g := testinstance.NewTestSessionGenerator(net)
55-
defer g.Close()
54+
ig := testinstance.NewTestInstanceGenerator(net)
55+
defer ig.Close()
5656

5757
block := blocks.NewBlock([]byte("block"))
5858
pinfo := p2ptestutil.RandTestBogusIdentityOrFatal(t)
5959
rs.Client(pinfo).Provide(context.Background(), block.Cid(), true) // but not on network
6060

61-
solo := g.Next()
61+
solo := ig.Next()
6262
defer solo.Exchange.Close()
6363

6464
ctx, cancel := context.WithTimeout(context.Background(), time.Nanosecond)
@@ -74,10 +74,10 @@ func TestGetBlockFromPeerAfterPeerAnnounces(t *testing.T) {
7474

7575
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
7676
block := blocks.NewBlock([]byte("block"))
77-
g := testinstance.NewTestSessionGenerator(net)
78-
defer g.Close()
77+
ig := testinstance.NewTestInstanceGenerator(net)
78+
defer ig.Close()
7979

80-
peers := g.Instances(2)
80+
peers := ig.Instances(2)
8181
hasBlock := peers[0]
8282
defer hasBlock.Exchange.Close()
8383

@@ -107,10 +107,10 @@ func TestDoesNotProvideWhenConfiguredNotTo(t *testing.T) {
107107

108108
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
109109
block := blocks.NewBlock([]byte("block"))
110-
g := testinstance.NewTestSessionGenerator(net)
111-
defer g.Close()
110+
ig := testinstance.NewTestInstanceGenerator(net)
111+
defer ig.Close()
112112

113-
hasBlock := g.Next()
113+
hasBlock := ig.Next()
114114
defer hasBlock.Exchange.Close()
115115

116116
if err := hasBlock.Exchange.HasBlock(block); err != nil {
@@ -120,7 +120,7 @@ func TestDoesNotProvideWhenConfiguredNotTo(t *testing.T) {
120120
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
121121
defer cancel()
122122

123-
wantsBlock := g.Next()
123+
wantsBlock := ig.Next()
124124
defer wantsBlock.Exchange.Close()
125125

126126
ns := wantsBlock.Exchange.NewSession(ctx).(*bssession.Session)
@@ -144,10 +144,10 @@ func TestUnwantedBlockNotAdded(t *testing.T) {
144144
bsMessage := message.New(true)
145145
bsMessage.AddBlock(block)
146146

147-
g := testinstance.NewTestSessionGenerator(net)
148-
defer g.Close()
147+
ig := testinstance.NewTestInstanceGenerator(net)
148+
defer ig.Close()
149149

150-
peers := g.Instances(2)
150+
peers := ig.Instances(2)
151151
hasBlock := peers[0]
152152
defer hasBlock.Exchange.Close()
153153

@@ -216,11 +216,11 @@ func PerformDistributionTest(t *testing.T, numInstances, numBlocks int) {
216216
t.SkipNow()
217217
}
218218
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
219-
sg := testinstance.NewTestSessionGenerator(net)
220-
defer sg.Close()
219+
ig := testinstance.NewTestInstanceGenerator(net)
220+
defer ig.Close()
221221
bg := blocksutil.NewBlockGenerator()
222222

223-
instances := sg.Instances(numInstances)
223+
instances := ig.Instances(numInstances)
224224
blocks := bg.Blocks(numBlocks)
225225

226226
t.Log("Give the blocks to the first instance")
@@ -279,11 +279,11 @@ func TestSendToWantingPeer(t *testing.T) {
279279
}
280280

281281
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
282-
sg := testinstance.NewTestSessionGenerator(net)
283-
defer sg.Close()
282+
ig := testinstance.NewTestInstanceGenerator(net)
283+
defer ig.Close()
284284
bg := blocksutil.NewBlockGenerator()
285285

286-
peers := sg.Instances(2)
286+
peers := ig.Instances(2)
287287
peerA := peers[0]
288288
peerB := peers[1]
289289

@@ -321,9 +321,9 @@ func TestSendToWantingPeer(t *testing.T) {
321321

322322
func TestEmptyKey(t *testing.T) {
323323
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
324-
sg := testinstance.NewTestSessionGenerator(net)
325-
defer sg.Close()
326-
bs := sg.Instances(1)[0].Exchange
324+
ig := testinstance.NewTestInstanceGenerator(net)
325+
defer ig.Close()
326+
bs := ig.Instances(1)[0].Exchange
327327

328328
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
329329
defer cancel()
@@ -354,13 +354,13 @@ func assertStat(t *testing.T, st *bitswap.Stat, sblks, rblks, sdata, rdata uint6
354354

355355
func TestBasicBitswap(t *testing.T) {
356356
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
357-
sg := testinstance.NewTestSessionGenerator(net)
358-
defer sg.Close()
357+
ig := testinstance.NewTestInstanceGenerator(net)
358+
defer ig.Close()
359359
bg := blocksutil.NewBlockGenerator()
360360

361361
t.Log("Test a one node trying to get one block from another")
362362

363-
instances := sg.Instances(3)
363+
instances := ig.Instances(3)
364364
blocks := bg.Blocks(1)
365365
err := instances[0].Exchange.HasBlock(blocks[0])
366366
if err != nil {
@@ -423,13 +423,13 @@ func TestBasicBitswap(t *testing.T) {
423423

424424
func TestDoubleGet(t *testing.T) {
425425
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
426-
sg := testinstance.NewTestSessionGenerator(net)
427-
defer sg.Close()
426+
ig := testinstance.NewTestInstanceGenerator(net)
427+
defer ig.Close()
428428
bg := blocksutil.NewBlockGenerator()
429429

430430
t.Log("Test a one node trying to get one block from another")
431431

432-
instances := sg.Instances(2)
432+
instances := ig.Instances(2)
433433
blocks := bg.Blocks(1)
434434

435435
// NOTE: A race condition can happen here where these GetBlocks requests go
@@ -491,11 +491,11 @@ func TestDoubleGet(t *testing.T) {
491491

492492
func TestWantlistCleanup(t *testing.T) {
493493
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
494-
sg := testinstance.NewTestSessionGenerator(net)
495-
defer sg.Close()
494+
ig := testinstance.NewTestInstanceGenerator(net)
495+
defer ig.Close()
496496
bg := blocksutil.NewBlockGenerator()
497497

498-
instances := sg.Instances(1)[0]
498+
instances := ig.Instances(1)[0]
499499
bswap := instances.Exchange
500500
blocks := bg.Blocks(20)
501501

@@ -602,13 +602,13 @@ func newReceipt(sent, recv, exchanged uint64) *decision.Receipt {
602602

603603
func TestBitswapLedgerOneWay(t *testing.T) {
604604
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
605-
sg := testinstance.NewTestSessionGenerator(net)
606-
defer sg.Close()
605+
ig := testinstance.NewTestInstanceGenerator(net)
606+
defer ig.Close()
607607
bg := blocksutil.NewBlockGenerator()
608608

609609
t.Log("Test ledgers match when one peer sends block to another")
610610

611-
instances := sg.Instances(2)
611+
instances := ig.Instances(2)
612612
blocks := bg.Blocks(1)
613613
err := instances[0].Exchange.HasBlock(blocks[0])
614614
if err != nil {
@@ -654,13 +654,13 @@ func TestBitswapLedgerOneWay(t *testing.T) {
654654

655655
func TestBitswapLedgerTwoWay(t *testing.T) {
656656
net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(kNetworkDelay))
657-
sg := testinstance.NewTestSessionGenerator(net)
658-
defer sg.Close()
657+
ig := testinstance.NewTestInstanceGenerator(net)
658+
defer ig.Close()
659659
bg := blocksutil.NewBlockGenerator()
660660

661661
t.Log("Test ledgers match when two peers send one block to each other")
662662

663-
instances := sg.Instances(2)
663+
instances := ig.Instances(2)
664664
blocks := bg.Blocks(2)
665665
err := instances[0].Exchange.HasBlock(blocks[0])
666666
if err != nil {

‎bitswap_with_sessions_test.go

+25-25
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ func TestBasicSessions(t *testing.T) {
1919
defer cancel()
2020

2121
vnet := getVirtualNetwork()
22-
sesgen := testinstance.NewTestSessionGenerator(vnet)
23-
defer sesgen.Close()
22+
ig := testinstance.NewTestInstanceGenerator(vnet)
23+
defer ig.Close()
2424
bgen := blocksutil.NewBlockGenerator()
2525

2626
block := bgen.Next()
27-
inst := sesgen.Instances(2)
27+
inst := ig.Instances(2)
2828

2929
a := inst[0]
3030
b := inst[1]
@@ -67,11 +67,11 @@ func TestSessionBetweenPeers(t *testing.T) {
6767
defer cancel()
6868

6969
vnet := getVirtualNetwork()
70-
sesgen := testinstance.NewTestSessionGenerator(vnet)
71-
defer sesgen.Close()
70+
ig := testinstance.NewTestInstanceGenerator(vnet)
71+
defer ig.Close()
7272
bgen := blocksutil.NewBlockGenerator()
7373

74-
inst := sesgen.Instances(10)
74+
inst := ig.Instances(10)
7575

7676
blks := bgen.Blocks(101)
7777
if err := inst[0].Blockstore().PutMany(blks); err != nil {
@@ -120,11 +120,11 @@ func TestSessionSplitFetch(t *testing.T) {
120120
defer cancel()
121121

122122
vnet := getVirtualNetwork()
123-
sesgen := testinstance.NewTestSessionGenerator(vnet)
124-
defer sesgen.Close()
123+
ig := testinstance.NewTestInstanceGenerator(vnet)
124+
defer ig.Close()
125125
bgen := blocksutil.NewBlockGenerator()
126126

127-
inst := sesgen.Instances(11)
127+
inst := ig.Instances(11)
128128

129129
blks := bgen.Blocks(100)
130130
for i := 0; i < 10; i++ {
@@ -163,11 +163,11 @@ func TestFetchNotConnected(t *testing.T) {
163163

164164
bssession.SetProviderSearchDelay(10 * time.Millisecond)
165165
vnet := getVirtualNetwork()
166-
sesgen := testinstance.NewTestSessionGenerator(vnet)
167-
defer sesgen.Close()
166+
ig := testinstance.NewTestInstanceGenerator(vnet)
167+
defer ig.Close()
168168
bgen := blocksutil.NewBlockGenerator()
169169

170-
other := sesgen.Next()
170+
other := ig.Next()
171171

172172
blks := bgen.Blocks(10)
173173
for _, block := range blks {
@@ -181,7 +181,7 @@ func TestFetchNotConnected(t *testing.T) {
181181
cids = append(cids, blk.Cid())
182182
}
183183

184-
thisNode := sesgen.Next()
184+
thisNode := ig.Next()
185185
ses := thisNode.Exchange.NewSession(ctx).(*bssession.Session)
186186
ses.SetBaseTickDelay(time.Millisecond * 10)
187187

@@ -203,12 +203,12 @@ func TestInterestCacheOverflow(t *testing.T) {
203203
defer cancel()
204204

205205
vnet := getVirtualNetwork()
206-
sesgen := testinstance.NewTestSessionGenerator(vnet)
207-
defer sesgen.Close()
206+
ig := testinstance.NewTestInstanceGenerator(vnet)
207+
defer ig.Close()
208208
bgen := blocksutil.NewBlockGenerator()
209209

210210
blks := bgen.Blocks(2049)
211-
inst := sesgen.Instances(2)
211+
inst := ig.Instances(2)
212212

213213
a := inst[0]
214214
b := inst[1]
@@ -255,12 +255,12 @@ func TestPutAfterSessionCacheEvict(t *testing.T) {
255255
defer cancel()
256256

257257
vnet := getVirtualNetwork()
258-
sesgen := testinstance.NewTestSessionGenerator(vnet)
259-
defer sesgen.Close()
258+
ig := testinstance.NewTestInstanceGenerator(vnet)
259+
defer ig.Close()
260260
bgen := blocksutil.NewBlockGenerator()
261261

262262
blks := bgen.Blocks(2500)
263-
inst := sesgen.Instances(1)
263+
inst := ig.Instances(1)
264264

265265
a := inst[0]
266266

@@ -295,12 +295,12 @@ func TestMultipleSessions(t *testing.T) {
295295
defer cancel()
296296

297297
vnet := getVirtualNetwork()
298-
sesgen := testinstance.NewTestSessionGenerator(vnet)
299-
defer sesgen.Close()
298+
ig := testinstance.NewTestInstanceGenerator(vnet)
299+
defer ig.Close()
300300
bgen := blocksutil.NewBlockGenerator()
301301

302302
blk := bgen.Blocks(1)[0]
303-
inst := sesgen.Instances(2)
303+
inst := ig.Instances(2)
304304

305305
a := inst[0]
306306
b := inst[1]
@@ -338,8 +338,8 @@ func TestWantlistClearsOnCancel(t *testing.T) {
338338
defer cancel()
339339

340340
vnet := getVirtualNetwork()
341-
sesgen := testinstance.NewTestSessionGenerator(vnet)
342-
defer sesgen.Close()
341+
ig := testinstance.NewTestInstanceGenerator(vnet)
342+
defer ig.Close()
343343
bgen := blocksutil.NewBlockGenerator()
344344

345345
blks := bgen.Blocks(10)
@@ -348,7 +348,7 @@ func TestWantlistClearsOnCancel(t *testing.T) {
348348
cids = append(cids, blk.Cid())
349349
}
350350

351-
inst := sesgen.Instances(1)
351+
inst := ig.Instances(1)
352352

353353
a := inst[0]
354354

0 commit comments

Comments
 (0)