Skip to content

Commit e2aa7e1

Browse files
gammazerogammazero
committed
chore: update to boxo without goprocess
1 parent 4009ad3 commit e2aa7e1

File tree

8 files changed

+22
-24
lines changed

8 files changed

+22
-24
lines changed

‎core/node/helpers.go

+11-12
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,29 @@ import (
88
"go.uber.org/fx"
99
)
1010

11-
type lcProcess struct {
11+
type lcStartStop struct {
1212
fx.In
1313

14-
LC fx.Lifecycle
15-
Proc goprocess.Process
14+
LC fx.Lifecycle
1615
}
1716

18-
// Append wraps ProcessFunc into a goprocess, and appends it to the lifecycle
19-
func (lp *lcProcess) Append(f goprocess.ProcessFunc) {
17+
// Append runx CtxFunc, and appends it to the lifecycle
18+
func (lcss *lcStartStop) Append(f func() func()) {
2019
// Hooks are guaranteed to run in sequence. If a hook fails to start, its
2120
// OnStop won't be executed.
22-
var proc goprocess.Process
21+
var stopFunc func()
2322

24-
lp.LC.Append(fx.Hook{
23+
lcss.LC.Append(fx.Hook{
2524
OnStart: func(ctx context.Context) error {
26-
proc = lp.Proc.Go(f)
25+
stopFunc = f()
2726
return nil
2827
},
2928
OnStop: func(ctx context.Context) error {
30-
if proc == nil { // Theoretically this shouldn't ever happen
31-
return errors.New("lcProcess: proc was nil")
29+
if stopFunc == nil { // Theoretically this shouldn't ever happen
30+
return errors.New("lcStatStop: stopFunc was nil")
3231
}
33-
34-
return proc.Close() // todo: respect ctx, somehow
32+
stopFunc()
33+
return nil
3534
},
3635
})
3736
}

‎core/node/ipns.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ func Namesys(cacheSize int, cacheMaxTTL time.Duration) func(rt irouting.ProvideM
4545
}
4646

4747
// IpnsRepublisher runs new IPNS republisher service
48-
func IpnsRepublisher(repubPeriod time.Duration, recordLifetime time.Duration) func(lcProcess, namesys.NameSystem, repo.Repo, crypto.PrivKey) error {
49-
return func(lc lcProcess, namesys namesys.NameSystem, repo repo.Repo, privKey crypto.PrivKey) error {
48+
func IpnsRepublisher(repubPeriod time.Duration, recordLifetime time.Duration) func(lcStartStop, namesys.NameSystem, repo.Repo, crypto.PrivKey) error {
49+
return func(lc lcStartStop, namesys namesys.NameSystem, repo repo.Repo, privKey crypto.PrivKey) error {
5050
repub := republisher.NewRepublisher(namesys, repo.Datastore(), privKey, repo.Keystore())
5151

5252
if repubPeriod != 0 {

‎docs/examples/kubo-as-a-library/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go 1.23
77
replace github.com/ipfs/kubo => ./../../..
88

99
require (
10-
github.com/ipfs/boxo v0.24.2
10+
github.com/ipfs/boxo v0.24.3-0.20241030212043-d15e9528c333
1111
github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
1212
github.com/libp2p/go-libp2p v0.37.0
1313
github.com/multiformats/go-multiaddr v0.13.0

‎docs/examples/kubo-as-a-library/go.sum

+2-3
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
298298
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
299299
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
300300
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
301-
github.com/ipfs/boxo v0.24.2 h1:feLM6DY6CNI0uSG3TvP/Hv4PdM/fsekjqSCqKtifF0E=
302-
github.com/ipfs/boxo v0.24.2/go.mod h1:Dt3TJjMZtF2QksMv2LC8pQlG9VQUiSV2DsHQzvDiroo=
301+
github.com/ipfs/boxo v0.24.3-0.20241030212043-d15e9528c333 h1:2OvIEEviF9OEqnEp4khojrAR+cxn2OVpx9VAZNJV9jc=
302+
github.com/ipfs/boxo v0.24.3-0.20241030212043-d15e9528c333/go.mod h1:cDmTBd0IEM6UuOIZGXfxhumKlGr5CK/kfh+2Ka662lc=
303303
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
304304
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
305305
github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=
@@ -405,7 +405,6 @@ github.com/ipshipyard/p2p-forge v0.0.1 h1:7Wy3Ul4gGLIPx4LjMjGaO6MoKa54ITDqwMOyXs
405405
github.com/ipshipyard/p2p-forge v0.0.1/go.mod h1:taPeh3PDSO8Ual0/N2tIOAUXPV8gZoPF3uPXoUyiq14=
406406
github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
407407
github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
408-
github.com/jbenet/go-cienv v0.1.0 h1:Vc/s0QbQtoxX8MwwSLWWh+xNNZvM3Lw7NsTcHrvvhMc=
409408
github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
410409
github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
411410
github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/hashicorp/go-version v1.7.0
2323
github.com/ipfs-shipyard/nopfs v0.0.12
2424
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c
25-
github.com/ipfs/boxo v0.24.2
25+
github.com/ipfs/boxo v0.24.3-0.20241030212043-d15e9528c333
2626
github.com/ipfs/go-block-format v0.2.0
2727
github.com/ipfs/go-cid v0.4.1
2828
github.com/ipfs/go-cidutil v0.1.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
361361
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
362362
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
363363
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
364-
github.com/ipfs/boxo v0.24.2 h1:feLM6DY6CNI0uSG3TvP/Hv4PdM/fsekjqSCqKtifF0E=
365-
github.com/ipfs/boxo v0.24.2/go.mod h1:Dt3TJjMZtF2QksMv2LC8pQlG9VQUiSV2DsHQzvDiroo=
364+
github.com/ipfs/boxo v0.24.3-0.20241030212043-d15e9528c333 h1:2OvIEEviF9OEqnEp4khojrAR+cxn2OVpx9VAZNJV9jc=
365+
github.com/ipfs/boxo v0.24.3-0.20241030212043-d15e9528c333/go.mod h1:cDmTBd0IEM6UuOIZGXfxhumKlGr5CK/kfh+2Ka662lc=
366366
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
367367
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
368368
github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=

‎test/dependencies/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ require (
119119
github.com/huin/goupnp v1.3.0 // indirect
120120
github.com/inconshreveable/mousetrap v1.1.0 // indirect
121121
github.com/ipfs/bbloom v0.0.4 // indirect
122-
github.com/ipfs/boxo v0.24.2 // indirect
122+
github.com/ipfs/boxo v0.24.3-0.20241030212043-d15e9528c333 // indirect
123123
github.com/ipfs/go-block-format v0.2.0 // indirect
124124
github.com/ipfs/go-cid v0.4.1 // indirect
125125
github.com/ipfs/go-datastore v0.6.0 // indirect

‎test/dependencies/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
318318
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
319319
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
320320
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
321-
github.com/ipfs/boxo v0.24.2 h1:feLM6DY6CNI0uSG3TvP/Hv4PdM/fsekjqSCqKtifF0E=
322-
github.com/ipfs/boxo v0.24.2/go.mod h1:Dt3TJjMZtF2QksMv2LC8pQlG9VQUiSV2DsHQzvDiroo=
321+
github.com/ipfs/boxo v0.24.3-0.20241030212043-d15e9528c333 h1:2OvIEEviF9OEqnEp4khojrAR+cxn2OVpx9VAZNJV9jc=
322+
github.com/ipfs/boxo v0.24.3-0.20241030212043-d15e9528c333/go.mod h1:cDmTBd0IEM6UuOIZGXfxhumKlGr5CK/kfh+2Ka662lc=
323323
github.com/ipfs/go-block-format v0.2.0 h1:ZqrkxBA2ICbDRbK8KJs/u0O3dlp6gmAuuXUJNiW1Ycs=
324324
github.com/ipfs/go-block-format v0.2.0/go.mod h1:+jpL11nFx5A/SPpsoBn6Bzkra/zaArfSmsknbPMYgzM=
325325
github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=

0 commit comments

Comments
 (0)