fix: utp close

Author: thinkAfCod

go.mod

@@ -53,7 +53,7 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.18
 	github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/optimism-java/utp-go v0.0.0-20241220063931-e7f66577a96c
+	github.com/optimism-java/utp-go v0.0.0-20241223124724-19352018cc52
 	github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7
 	github.com/pion/stun v0.6.1
 	github.com/protolambda/bls12-381-util v0.1.0

go.sum

@@ -421,8 +421,8 @@ github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/optimism-java/utp-go v0.0.0-20241220063931-e7f66577a96c h1:eyOa3zWzO+RAQGWq6V91mgCybfsuROLJZxuQpY+/Nbg=
-github.com/optimism-java/utp-go v0.0.0-20241220063931-e7f66577a96c/go.mod h1:dJZNMUlyNpjM2VkUEHhmFprLei6gCg3r7U9qj9MmJNQ=
+github.com/optimism-java/utp-go v0.0.0-20241223124724-19352018cc52 h1:5wq4o4t/umlNii796cEwNyhIT6KefKZv0uUEE6OJjvA=
+github.com/optimism-java/utp-go v0.0.0-20241223124724-19352018cc52/go.mod h1:dJZNMUlyNpjM2VkUEHhmFprLei6gCg3r7U9qj9MmJNQ=
 github.com/optimism-java/zrnt v0.32.4-0.20240415084906-d9dbf06b32f7 h1:ZTQWXQ8xblCRUXhZs3h5qrBMSAHe8iNH7BG7a7IVFlI=
 github.com/optimism-java/zrnt v0.32.4-0.20240415084906-d9dbf06b32f7/go.mod h1:A0fezkp9Tt3GBLATSPIbuY4ywYESyAuc/FFmPKg8Lqs=
 github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM=

p2p/discover/portal_protocol_test.go

@@ -493,11 +493,11 @@ func TestTraceContentLookup(t *testing.T) {
 
 	// check response
 	node3Response := res.Trace.Responses[node3Id]
-	assert.Equal(t, node3Response.RespondedWith, []string{node2Id})
+	assert.Equal(t, []string{node2Id}, node3Response.RespondedWith)
 
 	node2Response := res.Trace.Responses[node2Id]
-	assert.Equal(t, node2Response.RespondedWith, []string{node1Id})
+	assert.Equal(t, []string{node1Id}, node2Response.RespondedWith)
 
 	node1Response := res.Trace.Responses[node1Id]
-	assert.Equal(t, node1Response.RespondedWith, ([]string)(nil))
+	assert.Nil(t, node1Response.RespondedWith)
 }

p2p/discover/portal_utp.go

@@ -80,9 +80,11 @@ func (p *PortalUtp) Start() error {
 }
 
 func (p *PortalUtp) Stop() {
-	err := p.listener.Close()
-	if err != nil {
-		p.log.Error("close utp listener has error", "error", err)
+	if p.listener != nil {
+		err := p.listener.Close()
+		if err != nil {
+			p.log.Error("close utp listener has error", "error", err)
+		}
 	}
 	p.discV5.Close()
 }