Skip to content

Commit

Permalink
fix: omitempty UnixFSShardingSizeThreshold
Browse files Browse the repository at this point in the history
- applies fix from go-ipfs-config which removes null when default
- escapes JSON string when passed in sharness script
  • Loading branch information
lidel committed Oct 27, 2021
1 parent 67c43c6 commit 2285708
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/ipfs/go-ipfs-blockstore v0.1.6
github.com/ipfs/go-ipfs-chunker v0.0.5
github.com/ipfs/go-ipfs-cmds v0.6.0
github.com/ipfs/go-ipfs-config v0.16.1-0.20211025170559-871deacd5265
github.com/ipfs/go-ipfs-config v0.16.1-0.20211027214300-047a48592f2a
github.com/ipfs/go-ipfs-exchange-interface v0.0.1
github.com/ipfs/go-ipfs-exchange-offline v0.0.1
github.com/ipfs/go-ipfs-files v0.0.9
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,8 @@ github.com/ipfs/go-ipfs-chunker v0.0.5 h1:ojCf7HV/m+uS2vhUGWcogIIxiO5ubl5O57Q7Na
github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod h1:jhgdF8vxRHycr00k13FM8Y0E+6BoalYeobXmUyTreP8=
github.com/ipfs/go-ipfs-cmds v0.6.0 h1:yAxdowQZzoFKjcLI08sXVNnqVj3jnABbf9smrPQmBsw=
github.com/ipfs/go-ipfs-cmds v0.6.0/go.mod h1:ZgYiWVnCk43ChwoH8hAmI1IRbuVtq3GSTHwtRB/Kqhk=
github.com/ipfs/go-ipfs-config v0.16.1-0.20211025170559-871deacd5265 h1:zq5LdAPSTtnurJNwwVab2xZr+dDE7e3riZ5zoWH5Rk4=
github.com/ipfs/go-ipfs-config v0.16.1-0.20211025170559-871deacd5265/go.mod h1:wz2lKzOjgJeYJa6zx8W9VT7mz+iSd0laBMqS/9wmX6A=
github.com/ipfs/go-ipfs-config v0.16.1-0.20211027214300-047a48592f2a h1:CFy3kjOvnGnLC5XofG91h5mM3CYIzeVjiUcQCqWfpl0=
github.com/ipfs/go-ipfs-config v0.16.1-0.20211027214300-047a48592f2a/go.mod h1:wz2lKzOjgJeYJa6zx8W9VT7mz+iSd0laBMqS/9wmX6A=
github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0250-files-api.sh
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ tests_for_files_api "with-daemon"
test_kill_ipfs_daemon

test_expect_success "enable sharding in config" '
ipfs config --json Internal.UnixFSShardingSizeThreshold "1B"
ipfs config --json Internal.UnixFSShardingSizeThreshold "\"1B\""
'

test_launch_ipfs_daemon_without_network
Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0260-sharding.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test_add_large_dir "$UNSHARDED"
test_kill_ipfs_daemon

test_expect_success "enable sharding" '
ipfs config --json Internal.UnixFSShardingSizeThreshold "1B"
ipfs config --json Internal.UnixFSShardingSizeThreshold "\"1B\""
'

SHARDED="QmSCJD1KYLhVVHqBK3YyXuoEqHt7vggyJhzoFYbT8v1XYL"
Expand Down

0 comments on commit 2285708

Please sign in to comment.