Skip to content

Commit 3a13371

Browse files
committed
Revert "fix: upgrade utp version for using sync pool to get buffer"
This reverts commit 210a81d.
1 parent 2826476 commit 3a13371

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ require (
5555
github.com/mattn/go-sqlite3 v1.14.18
5656
github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
5757
github.com/olekukonko/tablewriter v0.0.5
58-
github.com/optimism-java/utp-go v0.0.0-20240530085325-d8dd9d262631
58+
github.com/optimism-java/utp-go v0.0.0-20240309041853-b6b3a0dea581
5959
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7
6060
github.com/protolambda/bls12-381-util v0.1.0
6161
github.com/protolambda/zrnt v0.32.2
@@ -75,7 +75,7 @@ require (
7575
golang.org/x/crypto v0.22.0
7676
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
7777
golang.org/x/sync v0.7.0
78-
golang.org/x/sys v0.20.0
78+
golang.org/x/sys v0.19.0
7979
golang.org/x/text v0.14.0
8080
golang.org/x/time v0.5.0
8181
golang.org/x/tools v0.20.0

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,6 @@ github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsq
431431
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
432432
github.com/optimism-java/utp-go v0.0.0-20240309041853-b6b3a0dea581 h1:ZxgrtI0xIw+clB32iDDDWaiTcCizTeN7rNyzH9YorPI=
433433
github.com/optimism-java/utp-go v0.0.0-20240309041853-b6b3a0dea581/go.mod h1:DZ0jYzLzt4ZsCmhI/iqYgGFoNx45OfpEoKzXB8HVALQ=
434-
github.com/optimism-java/utp-go v0.0.0-20240530085325-d8dd9d262631 h1:01AecSuOSS6fsIU/oTVG/C70hIl3xPen99qy2hGr57w=
435-
github.com/optimism-java/utp-go v0.0.0-20240530085325-d8dd9d262631/go.mod h1:DZ0jYzLzt4ZsCmhI/iqYgGFoNx45OfpEoKzXB8HVALQ=
436434
github.com/optimism-java/zrnt v0.32.4-0.20240415084906-d9dbf06b32f7 h1:ZTQWXQ8xblCRUXhZs3h5qrBMSAHe8iNH7BG7a7IVFlI=
437435
github.com/optimism-java/zrnt v0.32.4-0.20240415084906-d9dbf06b32f7/go.mod h1:A0fezkp9Tt3GBLATSPIbuY4ywYESyAuc/FFmPKg8Lqs=
438436
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM=
@@ -711,8 +709,6 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
711709
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
712710
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
713711
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
714-
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
715-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
716712
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
717713
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
718714
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

p2p/discover/portal_protocol_test.go

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package discover
22

33
import (
4+
"context"
45
"crypto/rand"
56
"errors"
67
"fmt"
@@ -233,9 +234,6 @@ func TestPortalWireProtocolUdp(t *testing.T) {
233234
assert.Equal(t, largeTestContent, data)
234235
}()
235236
workGroup.Wait()
236-
node1.Stop()
237-
node2.Stop()
238-
node3.Stop()
239237
}
240238

241239
func TestPortalWireProtocol(t *testing.T) {
@@ -375,6 +373,23 @@ func TestPortalWireProtocol(t *testing.T) {
375373
node3.Stop()
376374
}
377375

376+
func TestCancel(t *testing.T) {
377+
ctx, cancel := context.WithCancel(context.Background())
378+
379+
go func(ctx context.Context) {
380+
defer func() {
381+
t.Log("goroutine cancel")
382+
}()
383+
384+
time.Sleep(time.Second * 5)
385+
}(ctx)
386+
387+
cancel()
388+
t.Log("after main cancel")
389+
390+
time.Sleep(time.Second * 3)
391+
}
392+
378393
func TestContentLookup(t *testing.T) {
379394
node1, err := setupLocalPortalNode(":17777", nil)
380395
assert.NoError(t, err)
@@ -413,10 +428,6 @@ func TestContentLookup(t *testing.T) {
413428
res, _, err = node1.ContentLookup(nonExist, node1.toContentId(nonExist))
414429
assert.Equal(t, ContentNotFound, err)
415430
assert.Nil(t, res)
416-
417-
node1.Stop()
418-
node2.Stop()
419-
node3.Stop()
420431
}
421432

422433
func TestTraceContentLookup(t *testing.T) {
@@ -486,8 +497,4 @@ func TestTraceContentLookup(t *testing.T) {
486497
// res, _, err = node1.ContentLookup([]byte{0x2, 0x4})
487498
// assert.Equal(t, ContentNotFound, err)
488499
// assert.Nil(t, res)
489-
490-
node1.Stop()
491-
node2.Stop()
492-
node3.Stop()
493500
}

0 commit comments

Comments
 (0)