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

Commit 48f53bb

Browse files
committed
fix(deps): update libp2p for cleanup
Updated Libp2p and used it's newly exposed RateLimiter public interface
1 parent fe0a253 commit 48f53bb

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"gxDependencies": [
1010
{
1111
"author": "whyrusleeping",
12-
"hash": "QmdJdFQc5U3RAKgJQGmWR7SSM7TLuER5FWz5Wq6Tzs2CnS",
12+
"hash": "QmYxivS34F2M2n44WQQnRHGAKS8aoRUxwGpi9wk4Cdn4Jf",
1313
"name": "go-libp2p",
14-
"version": "6.0.29"
14+
"version": "6.0.30"
1515
},
1616
{
1717
"author": "hsanjuan",

testnet/virtual.go

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,14 @@ func VirtualNetwork(rs mockrouting.Server, d delay.D) Network {
3636
}
3737
}
3838

39-
type rateLimiter interface {
40-
Limit(dataSize int) time.Duration
41-
}
42-
4339
type RateLimitGenerator interface {
4440
NextRateLimit() float64
4541
}
4642

4743
func RateLimitedVirtualNetwork(rs mockrouting.Server, d delay.D, rateLimitGenerator RateLimitGenerator) Network {
4844
return &network{
4945
latencies: make(map[peer.ID]map[peer.ID]time.Duration),
50-
rateLimiters: make(map[peer.ID]map[peer.ID]rateLimiter),
46+
rateLimiters: make(map[peer.ID]map[peer.ID]*mocknet.RateLimiter),
5147
clients: make(map[peer.ID]*receiverQueue),
5248
delay: d,
5349
routingserver: rs,
@@ -60,7 +56,7 @@ func RateLimitedVirtualNetwork(rs mockrouting.Server, d delay.D, rateLimitGenera
6056
type network struct {
6157
mu sync.Mutex
6258
latencies map[peer.ID]map[peer.ID]time.Duration
63-
rateLimiters map[peer.ID]map[peer.ID]rateLimiter
59+
rateLimiters map[peer.ID]map[peer.ID]*mocknet.RateLimiter
6460
clients map[peer.ID]*receiverQueue
6561
routingserver mockrouting.Server
6662
delay delay.D
@@ -133,18 +129,18 @@ func (n *network) SendMessage(
133129
if n.isRateLimited {
134130
rateLimiters, ok := n.rateLimiters[from]
135131
if !ok {
136-
rateLimiters = make(map[peer.ID]rateLimiter)
132+
rateLimiters = make(map[peer.ID]*mocknet.RateLimiter)
137133
n.rateLimiters[from] = rateLimiters
138134
}
139135

140-
rl, ok := rateLimiters[to]
136+
rateLimiter, ok := rateLimiters[to]
141137
if !ok {
142-
rl = mocknet.NewRatelimiter(n.rateLimitGenerator.NextRateLimit())
143-
rateLimiters[to] = rl
138+
rateLimiter = mocknet.NewRateLimiter(n.rateLimitGenerator.NextRateLimit())
139+
rateLimiters[to] = rateLimiter
144140
}
145141

146142
size := mes.ToProtoV1().Size()
147-
bandwidthDelay = rl.Limit(size)
143+
bandwidthDelay = rateLimiter.Limit(size)
148144
} else {
149145
bandwidthDelay = 0
150146
}

0 commit comments

Comments
 (0)