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

Commit 1d285c7

Browse files
authored
Merge pull request #1776 from OpenBazaar/1749-net-service-panic-fix
Fix net.service shutdown panic
2 parents 0e1f030 + bf5804f commit 1d285c7

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

net/service/service.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,11 @@ func (service *OpenBazaarService) handleNewMessage(s inet.Stream) {
108108
if err := r.ReadMsg(pmes); err != nil {
109109
err = s.Reset()
110110
if err != nil {
111-
log.Error(err)
112-
}
113-
if err == io.EOF {
114-
log.Debugf("Disconnected from peer %s", mPeer.Pretty())
115-
} else {
116-
log.Errorf("Error when reading message from %s: %s", mPeer.Pretty(), err.Error())
111+
if err == io.EOF {
112+
log.Debugf("Disconnected from peer %s", mPeer.Pretty())
113+
} else {
114+
log.Errorf("Error when reading message from %s: %s", mPeer.Pretty(), err.Error())
115+
}
117116
}
118117
return
119118
}

qa/testdata/digital.json

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
"contractType": "DIGITAL_GOOD",
66
"format": "FIXED_PRICE",
77
"expiry": "2030-08-17T04:52:19.000Z",
8-
"pricingCurrency": {
9-
"code": "TBTC",
10-
"divisibility": 8,
11-
"name": "A",
12-
"currencyType": "A"
13-
},
148
"acceptedCurrencies": ["TBTC", "TBCH", "TLTC", "TZEC"]
159
},
1610
"item": {
@@ -20,9 +14,7 @@
2014
"bigPrice": "12000000",
2115
"priceCurrency": {
2216
"code": "TBTC",
23-
"divisibility": 8,
24-
"name": "A",
25-
"currencyType": "A"
17+
"divisibility": 8
2618
},
2719
"tags": [
2820
"documentary"
@@ -41,8 +33,7 @@
4133
"movies"
4234
],
4335
"condition": "New",
44-
"skus": [
45-
]
36+
"skus": []
4637
},
4738
"taxes": [
4839
{

0 commit comments

Comments
 (0)