Skip to content

Commit 4d56566

Browse files
zl03jsjzl03jsj
authored
Fix: compile error caused by unreachable package (#4854)
* fix: upgrade specs-storage to v0.2.2, which currently import a runreachable version of spec-actors
1 parent 5097537 commit 4d56566

23 files changed

Lines changed: 819 additions & 772 deletions

File tree

‎app/submodule/network/libp2p.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ func (noopLibP2PHost) ConnManager() connmgr.ConnManager {
8282

8383
type noopLibP2PNetwork struct{}
8484

85+
func (n noopLibP2PNetwork) ResourceManager() net.ResourceManager {
86+
panic("implement me")
87+
}
88+
8589
func (noopLibP2PNetwork) Peerstore() peerstore.Peerstore {
8690
panic("implement me")
8791
}

‎app/submodule/network/network_submodule.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"context"
66
"fmt"
77
"os"
8-
"path/filepath"
98
"runtime"
109
"time"
1110

@@ -223,16 +222,9 @@ func NewNetworkSubmodule(ctx context.Context, config networkConfig) (*NetworkSub
223222

224223
dtNet := dtnet.NewFromLibp2pHost(peerHost)
225224
dtDs := namespace.Wrap(config.Repo().ChainDatastore(), datastore.NewKey("/datatransfer/api/transfers"))
226-
transport := dtgstransport.NewTransport(peerHost.ID(), gsync, dtn)
225+
transport := dtgstransport.NewTransport(peerHost.ID(), gsync)
227226

228-
repoPath, err := config.Repo().Path()
229-
if err != nil {
230-
return nil, err
231-
}
232-
233-
dirPath := filepath.Join(repoPath, "data-transfer")
234-
_ = os.MkdirAll(dirPath, 0777) //todo fix for test
235-
dt, err := dtimpl.NewDataTransfer(dtDs, dirPath, dtNet, transport)
227+
dt, err := dtimpl.NewDataTransfer(dtDs, dtn, transport)
236228
if err != nil {
237229
return nil, err
238230
}

‎cmd/paych.go‎

Lines changed: 12 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,7 @@ var addFundsCmd = &cmds.Command{
6565
if err != nil {
6666
return err
6767
}
68-
if err := re.Emit(chAddr); err != nil {
69-
return err
70-
}
71-
return nil
68+
return re.Emit(chAddr)
7269
},
7370
}
7471

@@ -81,10 +78,7 @@ var listCmd = &cmds.Command{
8178
if err != nil {
8279
return err
8380
}
84-
if err := re.Emit(addrs); err != nil {
85-
return err
86-
}
87-
return nil
81+
return re.Emit(addrs)
8882
},
8983
}
9084

@@ -129,10 +123,7 @@ var settleCmd = &cmds.Command{
129123
if mwait.Receipt.ExitCode != 0 {
130124
return xerrors.Errorf("settle message execution failed (exit code %d)", mwait.Receipt.ExitCode)
131125
}
132-
if err := re.Emit(fmt.Sprintf("Settled channel %s", chanAddr)); err != nil {
133-
return err
134-
}
135-
return nil
126+
return re.Emit(fmt.Sprintf("Settled channel %s", chanAddr))
136127
},
137128
}
138129
var statusCmd = &cmds.Command{
@@ -155,10 +146,7 @@ var statusCmd = &cmds.Command{
155146
//re.Emit(av)
156147
w := bytes.NewBuffer(nil)
157148
paychStatus(w, av)
158-
if err := re.Emit(w); err != nil {
159-
return err
160-
}
161-
return nil
149+
return re.Emit(w)
162150
},
163151
}
164152
var sbftCmd = &cmds.Command{
@@ -184,10 +172,7 @@ var sbftCmd = &cmds.Command{
184172
}
185173
w := bytes.NewBuffer(nil)
186174
paychStatus(w, av)
187-
if err := re.Emit(w); err != nil {
188-
return err
189-
}
190-
return nil
175+
return re.Emit(w)
191176
},
192177
}
193178
var collectCmd = &cmds.Command{
@@ -214,10 +199,7 @@ var collectCmd = &cmds.Command{
214199
return xerrors.Errorf("collect message execution failed (exit code %d)", mwait.Receipt.ExitCode)
215200
}
216201

217-
if err := re.Emit(fmt.Sprintf("Collected funds for channel %s", chanAddr)); err != nil {
218-
return err
219-
}
220-
return nil
202+
return re.Emit(fmt.Sprintf("Collected funds for channel %s", chanAddr))
221203
},
222204
}
223205

@@ -255,10 +237,7 @@ var voucherCreateCmd = &cmds.Command{
255237
return err
256238
}
257239

258-
if err := re.Emit(enc); err != nil {
259-
return err
260-
}
261-
return nil
240+
return re.Emit(enc)
262241
},
263242
}
264243

@@ -283,10 +262,7 @@ var voucherCheckCmd = &cmds.Command{
283262
if err != nil {
284263
return err
285264
}
286-
if err := re.Emit("voucher is valid"); err != nil {
287-
return err
288-
}
289-
return nil
265+
return re.Emit("voucher is valid")
290266
},
291267
}
292268

@@ -311,10 +287,7 @@ var voucherAddCmd = &cmds.Command{
311287
if err != nil {
312288
return err
313289
}
314-
if err := re.Emit("add voucher successfully"); err != nil {
315-
return err
316-
}
317-
return nil
290+
return re.Emit("add voucher successfully")
318291
},
319292
}
320293

@@ -343,10 +316,7 @@ var voucherListCmd = &cmds.Command{
343316
fmt.Fprintf(buff, "Lane %d, Nonce %d: %s, voucher: %s\n", v.Lane, v.Nonce, v.Amount.String(), str)
344317
}
345318

346-
if err := re.Emit(buff); err != nil {
347-
return err
348-
}
349-
return nil
319+
return re.Emit(buff)
350320
},
351321
}
352322

@@ -379,10 +349,7 @@ var voucherBestSpendableCmd = &cmds.Command{
379349
}
380350
fmt.Fprintf(buff, "Lane %d, Nonce %d: %s, voucher: %s\n", v.Lane, v.Nonce, v.Amount.String(), str)
381351
}
382-
if err := re.Emit(buff); err != nil {
383-
return err
384-
}
385-
return nil
352+
return re.Emit(buff)
386353
},
387354
}
388355
var voucherSubmitCmd = &cmds.Command{
@@ -413,10 +380,7 @@ var voucherSubmitCmd = &cmds.Command{
413380
if mwait.Receipt.ExitCode != 0 {
414381
return xerrors.Errorf("message execution failed (exit code %d)", mwait.Receipt.ExitCode)
415382
}
416-
if err := re.Emit("channel updated successfully"); err != nil {
417-
return err
418-
}
419-
return nil
383+
return re.Emit("channel updated successfully")
420384
},
421385
}
422386

‎cmd/seed.go‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,7 @@ var genesisNewCmd = &cmds.Command{
9494
return err
9595
}
9696

97-
if err := ioutil.WriteFile(genf, genb, 0644); err != nil {
98-
return err
99-
}
100-
101-
return nil
97+
return ioutil.WriteFile(genf, genb, 0644)
10298
},
10399
}
104100

@@ -174,11 +170,7 @@ var genesisAddMinerCmd = &cmds.Command{
174170
return err
175171
}
176172

177-
if err := ioutil.WriteFile(genf, genb, 0644); err != nil {
178-
return err
179-
}
180-
181-
return nil
173+
return ioutil.WriteFile(genf, genb, 0644)
182174
},
183175
}
184176

@@ -244,10 +236,7 @@ var genesisAddMsigsCmd = &cmds.Command{
244236
return err
245237
}
246238

247-
if err := ioutil.WriteFile(genf, b, 0644); err != nil {
248-
return err
249-
}
250-
return nil
239+
return ioutil.WriteFile(genf, b, 0644)
251240
},
252241
}
253242

@@ -411,10 +400,7 @@ var genesisSetVRKCmd = &cmds.Command{
411400
return err
412401
}
413402

414-
if err := ioutil.WriteFile(genf, b, 0644); err != nil {
415-
return err
416-
}
417-
return nil
403+
return ioutil.WriteFile(genf, b, 0644)
418404
},
419405
}
420406

@@ -507,10 +493,7 @@ var genesisSetRemainderCmd = &cmds.Command{
507493
return err
508494
}
509495

510-
if err := ioutil.WriteFile(genf, b, 0644); err != nil {
511-
return err
512-
}
513-
return nil
496+
return ioutil.WriteFile(genf, b, 0644)
514497
},
515498
}
516499

@@ -558,10 +541,7 @@ var genesisSetActorVersionCmd = &cmds.Command{
558541
return err
559542
}
560543

561-
if err := ioutil.WriteFile(genf, b, 0644); err != nil {
562-
return err
563-
}
564-
return nil
544+
return ioutil.WriteFile(genf, b, 0644)
565545
},
566546
}
567547

‎cmd/swarm.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,7 @@ func (idd *IDDetails) UnmarshalJSON(data []byte) error {
350350
if err := decode(v, "ProtocolVersion", &idd.ProtocolVersion); err != nil {
351351
return err
352352
}
353-
if err := decode(v, "PublicKey", &idd.PublicKey); err != nil {
354-
return err
355-
}
356-
return nil
353+
return decode(v, "PublicKey", &idd.PublicKey)
357354
}
358355

359356
func decode(idd map[string]*json.RawMessage, key string, dest interface{}) error {

‎cmd/sync.go‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,7 @@ var storeStatusCmd = &cmds.Command{
111111
count++
112112
}
113113

114-
if err := re.Emit(w); err != nil {
115-
return err
116-
}
117-
return nil
114+
return re.Emit(w)
118115
},
119116
}
120117

@@ -148,9 +145,6 @@ var historyCmd = &cmds.Command{
148145
count++
149146
}
150147

151-
if err := re.Emit(w); err != nil {
152-
return err
153-
}
154-
return nil
148+
return re.Emit(w)
155149
},
156150
}

‎go.mod‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ require (
2424
github.com/filecoin-project/go-cbor-util v0.0.1
2525
github.com/filecoin-project/go-commp-utils v0.1.3
2626
github.com/filecoin-project/go-crypto v0.0.1
27-
github.com/filecoin-project/go-data-transfer v1.12.1
27+
github.com/filecoin-project/go-data-transfer v1.15.1
2828
github.com/filecoin-project/go-fil-commcid v0.1.0
29-
github.com/filecoin-project/go-fil-markets v1.14.1
29+
github.com/filecoin-project/go-fil-markets v1.20.1
3030
github.com/filecoin-project/go-jsonrpc v0.1.4-0.20210217175800-45ea43ac2bec
3131
github.com/filecoin-project/go-leb128 v0.0.0-20190212224330-8d79a5489543
3232
github.com/filecoin-project/go-paramfetch v0.0.4
@@ -37,8 +37,8 @@ require (
3737
github.com/filecoin-project/specs-actors/v4 v4.0.1
3838
github.com/filecoin-project/specs-actors/v5 v5.0.4
3939
github.com/filecoin-project/specs-actors/v6 v6.0.1
40-
github.com/filecoin-project/specs-actors/v7 v7.0.0-rc1
41-
github.com/filecoin-project/specs-storage v0.2.0
40+
github.com/filecoin-project/specs-actors/v7 v7.0.0
41+
github.com/filecoin-project/specs-storage v0.2.2
4242
github.com/filecoin-project/test-vectors/schema v0.0.5
4343
github.com/filecoin-project/venus-auth v1.3.2
4444
github.com/fxamacker/cbor/v2 v2.4.0
@@ -67,8 +67,8 @@ require (
6767
github.com/ipfs/go-cid v0.1.0
6868
github.com/ipfs/go-datastore v0.5.1
6969
github.com/ipfs/go-ds-badger2 v0.1.2
70-
github.com/ipfs/go-fs-lock v0.0.6
71-
github.com/ipfs/go-graphsync v0.11.5
70+
github.com/ipfs/go-fs-lock v0.0.7
71+
github.com/ipfs/go-graphsync v0.13.1
7272
github.com/ipfs/go-ipfs-blockstore v1.1.2
7373
github.com/ipfs/go-ipfs-chunker v0.0.5
7474
github.com/ipfs/go-ipfs-cmdkit v0.0.1
@@ -81,26 +81,26 @@ require (
8181
github.com/ipfs/go-ipld-cbor v0.0.6
8282
github.com/ipfs/go-ipld-format v0.2.0
8383
github.com/ipfs/go-log v1.0.5
84-
github.com/ipfs/go-log/v2 v2.4.0
84+
github.com/ipfs/go-log/v2 v2.5.0
8585
github.com/ipfs/go-merkledag v0.5.1
86-
github.com/ipfs/go-path v0.0.7
87-
github.com/ipfs/go-unixfs v0.2.6
86+
github.com/ipfs/go-path v0.2.1
87+
github.com/ipfs/go-unixfs v0.3.1
8888
github.com/ipld/go-car v0.3.3
8989
github.com/jbenet/goprocess v0.1.4
9090
github.com/jonboulle/clockwork v0.2.2 // indirect
9191
github.com/libp2p/go-eventbus v0.2.1
92-
github.com/libp2p/go-libp2p v0.17.0
93-
github.com/libp2p/go-libp2p-core v0.13.0
92+
github.com/libp2p/go-libp2p v0.18.0-rc3
93+
github.com/libp2p/go-libp2p-core v0.14.0
9494
github.com/libp2p/go-libp2p-kad-dht v0.15.0
9595
github.com/libp2p/go-libp2p-peerstore v0.6.0
96-
github.com/libp2p/go-libp2p-pubsub v0.6.0
97-
github.com/libp2p/go-libp2p-swarm v0.9.0
98-
github.com/libp2p/go-libp2p-yamux v0.7.0
96+
github.com/libp2p/go-libp2p-pubsub v0.6.1
97+
github.com/libp2p/go-libp2p-swarm v0.10.1
98+
github.com/libp2p/go-libp2p-yamux v0.8.1
9999
github.com/mattn/go-runewidth v0.0.9 // indirect
100100
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
101101
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
102102
github.com/mitchellh/go-homedir v1.1.0
103-
github.com/multiformats/go-multiaddr v0.4.1
103+
github.com/multiformats/go-multiaddr v0.5.0
104104
github.com/multiformats/go-multiaddr-dns v0.3.1
105105
github.com/multiformats/go-multihash v0.1.0
106106
github.com/onsi/gomega v1.15.0 // indirect
@@ -120,16 +120,15 @@ require (
120120
github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e
121121
github.com/stretchr/objx v0.2.0 // indirect
122122
github.com/stretchr/testify v1.7.0
123-
github.com/whyrusleeping/cbor-gen v0.0.0-20210713220151-be142a5ae1a8
123+
github.com/whyrusleeping/cbor-gen v0.0.0-20220302191723-37c43cae8e14
124124
github.com/whyrusleeping/go-logging v0.0.1
125125
github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1
126126
github.com/whyrusleeping/pubsub v0.0.0-20190708150250-92bcb0691325
127-
github.com/xorcare/golden v0.6.1-0.20191112154924-b87f686d7542 // indirect
128127
go.etcd.io/bbolt v1.3.6 // indirect
129128
go.opencensus.io v0.23.0
130129
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
131130
go.uber.org/zap v1.19.1
132-
golang.org/x/crypto v0.0.0-20210915214749-c084706c2272
131+
golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b
133132
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
134133
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
135134
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c

0 commit comments

Comments
 (0)