Skip to content

Commit 5a0f36b

Browse files
gammazerogammazero
committed
code review changes
1 parent 22f399d commit 5a0f36b

File tree

9 files changed

+11
-21
lines changed

9 files changed

+11
-21
lines changed

‎client/rpc/pin.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (api *PinAPI) Ls(ctx context.Context, pins chan<- iface.Pin, opts ...caopts
8787
if err != io.EOF {
8888
return err
8989
}
90-
break
90+
return nil
9191
}
9292

9393
c, err := cid.Parse(out.Cid)
@@ -101,7 +101,6 @@ func (api *PinAPI) Ls(ctx context.Context, pins chan<- iface.Pin, opts ...caopts
101101
return ctx.Err()
102102
}
103103
}
104-
return nil
105104
}
106105

107106
// IsPinned returns whether or not the given cid is pinned

‎client/rpc/unixfs.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func (api *UnixfsAPI) Ls(ctx context.Context, p path.Path, out chan<- iface.DirE
173173
if err != io.EOF {
174174
return err
175175
}
176-
break
176+
return nil
177177
}
178178

179179
if len(link.Objects) != 1 {
@@ -216,8 +216,6 @@ func (api *UnixfsAPI) Ls(ctx context.Context, p path.Path, out chan<- iface.DirE
216216
return ctx.Err()
217217
}
218218
}
219-
220-
return nil
221219
}
222220

223221
func (api *UnixfsAPI) core() *HttpApi {

‎core/commands/pin/remotepin.go

-7
Original file line numberDiff line numberDiff line change
@@ -351,13 +351,6 @@ func lsRemote(ctx context.Context, req *cmds.Request, c *pinclient.Client, out c
351351
opts = append(opts, pinclient.PinOpts.FilterStatus(parsedStatuses...))
352352
}
353353

354-
/*
355-
rmtOut, rmtErr := c.Ls(ctx, opts...)
356-
for p := range rmtOut {
357-
out <- p
358-
}
359-
return <-rmtErr
360-
*/
361354
return c.Ls2(ctx, out, opts...)
362355
}
363356

‎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.4-0.20241127172419-52a6a06b605d
10+
github.com/ipfs/boxo v0.24.4-0.20241203042627-f06377d01dda
1111
github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
1212
github.com/libp2p/go-libp2p v0.37.2
1313
github.com/multiformats/go-multiaddr v0.13.0

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
302302
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
303303
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
304304
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
305-
github.com/ipfs/boxo v0.24.4-0.20241127172419-52a6a06b605d h1:UgBskn6bIS4Qf2GrRkDDwMRYhMaPiwHuCSW1cp0m62Y=
306-
github.com/ipfs/boxo v0.24.4-0.20241127172419-52a6a06b605d/go.mod h1:lAoydO+oJhB1e7pUn4ju1Z1fuUIwy+zb0hQXRb/bu2g=
305+
github.com/ipfs/boxo v0.24.4-0.20241203042627-f06377d01dda h1:pw/JcDfod0D3nbOHhTBvnOFO0vhAV9+h7wJn3wx8ztM=
306+
github.com/ipfs/boxo v0.24.4-0.20241203042627-f06377d01dda/go.mod h1:lAoydO+oJhB1e7pUn4ju1Z1fuUIwy+zb0hQXRb/bu2g=
307307
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
308308
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
309309
github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=

‎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.4-0.20241127172419-52a6a06b605d
25+
github.com/ipfs/boxo v0.24.4-0.20241203042627-f06377d01dda
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
@@ -366,8 +366,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
366366
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
367367
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
368368
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
369-
github.com/ipfs/boxo v0.24.4-0.20241127172419-52a6a06b605d h1:UgBskn6bIS4Qf2GrRkDDwMRYhMaPiwHuCSW1cp0m62Y=
370-
github.com/ipfs/boxo v0.24.4-0.20241127172419-52a6a06b605d/go.mod h1:lAoydO+oJhB1e7pUn4ju1Z1fuUIwy+zb0hQXRb/bu2g=
369+
github.com/ipfs/boxo v0.24.4-0.20241203042627-f06377d01dda h1:pw/JcDfod0D3nbOHhTBvnOFO0vhAV9+h7wJn3wx8ztM=
370+
github.com/ipfs/boxo v0.24.4-0.20241203042627-f06377d01dda/go.mod h1:lAoydO+oJhB1e7pUn4ju1Z1fuUIwy+zb0hQXRb/bu2g=
371371
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
372372
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
373373
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.4-0.20241127172419-52a6a06b605d // indirect
122+
github.com/ipfs/boxo v0.24.4-0.20241203042627-f06377d01dda // 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
@@ -322,8 +322,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
322322
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
323323
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
324324
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
325-
github.com/ipfs/boxo v0.24.4-0.20241127172419-52a6a06b605d h1:UgBskn6bIS4Qf2GrRkDDwMRYhMaPiwHuCSW1cp0m62Y=
326-
github.com/ipfs/boxo v0.24.4-0.20241127172419-52a6a06b605d/go.mod h1:lAoydO+oJhB1e7pUn4ju1Z1fuUIwy+zb0hQXRb/bu2g=
325+
github.com/ipfs/boxo v0.24.4-0.20241203042627-f06377d01dda h1:pw/JcDfod0D3nbOHhTBvnOFO0vhAV9+h7wJn3wx8ztM=
326+
github.com/ipfs/boxo v0.24.4-0.20241203042627-f06377d01dda/go.mod h1:lAoydO+oJhB1e7pUn4ju1Z1fuUIwy+zb0hQXRb/bu2g=
327327
github.com/ipfs/go-block-format v0.2.0 h1:ZqrkxBA2ICbDRbK8KJs/u0O3dlp6gmAuuXUJNiW1Ycs=
328328
github.com/ipfs/go-block-format v0.2.0/go.mod h1:+jpL11nFx5A/SPpsoBn6Bzkra/zaArfSmsknbPMYgzM=
329329
github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=

0 commit comments

Comments
 (0)