diff --git a/core/coreunix/metadata_test.go b/core/coreunix/metadata_test.go index c7d1b94db38..f5b7a00387d 100644 --- a/core/coreunix/metadata_test.go +++ b/core/coreunix/metadata_test.go @@ -2,7 +2,6 @@ package coreunix import ( "bytes" - "context" "io" "testing" @@ -31,11 +30,11 @@ func getDagserv(t *testing.T) ipld.DAGService { } func TestMetadata(t *testing.T) { - ctx := context.Background() + ctx := t.Context() // Make some random node ds := getDagserv(t) data := make([]byte, 1000) - _, err := io.ReadFull(random.NewRand(), data) + _, err := io.ReadFull(random.New(), data) if err != nil { t.Fatal(err) } diff --git a/docs/changelogs/v0.43.md b/docs/changelogs/v0.43.md index dd9fff14abd..9a0e46a3a63 100644 --- a/docs/changelogs/v0.43.md +++ b/docs/changelogs/v0.43.md @@ -22,6 +22,7 @@ This release was brought to you by the [Shipyard](https://ipshipyard.com/) team. - [๐Ÿ `ipfs routing findprovs` no longer crashes the daemon](#-ipfs-routing-findprovs-no-longer-crashes-the-daemon) - [๐Ÿ›ก๏ธ Memory exhaustion fix for pubsub](#-memory-exhaustion-fix-for-pubsub) - [๐Ÿ“Š Telemetry is now opt-in](#-telemetry-is-now-opt-in) + - [๐Ÿงช Tests use new go-test and rand v2](#-tests-use-new-go-test-and-rand-v2) - [๐Ÿ“ฆ๏ธ Dependency updates](#-dependency-updates) - [๐Ÿ“ Changelog](#-changelog) - [๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ Contributors](#-contributors) @@ -129,6 +130,14 @@ This flaw is already public, which is why we name it here. libp2p disclosed it a The telemetry plugin is now opt-in and ships with no built-in endpoint: a node sends nothing until you set `Plugins.Plugins.telemetry.Config.Mode` to `on` and `Endpoint` to a collector you run, documented along with the payload schema in [telemetry.md](https://github.com/ipfs/kubo/blob/master/docs/telemetry.md). +#### ๐Ÿงช Tests use new go-test and rand v2 + +The new `go-test` is upgraded to use `math/rand/v2` in all of its packages. The `/go-test/random` package now allows reuse of the random number generator for more efficiently generating sets of random values. + +Additionally, the `/go-test/random` package removes support for a global seed for the random number generator. This led to the possibility of multiple tests setting the global seed to generate deterministic values, and breaking other tests by causing the generator to generate unexpected values. This breakage could be intermittent and difficult to debug, depending on the how/which tests ran at the same time. + +Since the underlying pseudo-random number generator was changed in the go-test module, the data generated for a given seed also changed. This required updating tests that relied on seeding the generator and getting expected values. + #### ๐Ÿ“ฆ๏ธ Dependency updates - update `go-libp2p` to a pre-release pinned at [95be6665](https://github.com/libp2p/go-libp2p/commit/95be6665b014e3e29bdb639ec10f8944d141969d), ahead of v0.48.0 (no tagged release yet) diff --git a/docs/examples/kubo-as-a-library/go.mod b/docs/examples/kubo-as-a-library/go.mod index 5196bfdddb7..528c211846b 100644 --- a/docs/examples/kubo-as-a-library/go.mod +++ b/docs/examples/kubo-as-a-library/go.mod @@ -7,7 +7,7 @@ go 1.26.4 replace github.com/ipfs/kubo => ./../../.. require ( - github.com/ipfs/boxo v0.41.1-0.20260707130650-177b35c8ef09 + github.com/ipfs/boxo v0.41.1-0.20260714175209-5ecaf9b4bcda github.com/ipfs/kubo v0.0.0-00010101000000-000000000000 github.com/libp2p/go-libp2p v0.48.1-0.20260708062241-95be6665b014 github.com/multiformats/go-multiaddr v0.16.1 @@ -99,7 +99,7 @@ require ( github.com/ipfs/go-log/v2 v2.9.2 // indirect github.com/ipfs/go-metrics-interface v0.3.0 // indirect github.com/ipfs/go-peertaskqueue v0.8.3 // indirect - github.com/ipfs/go-test v0.3.0 // indirect + github.com/ipfs/go-test v0.4.0 // indirect github.com/ipfs/go-unixfsnode v1.10.5 // indirect github.com/ipld/go-car/v2 v2.17.0 // indirect github.com/ipld/go-codec-dagpb v1.7.0 // indirect diff --git a/docs/examples/kubo-as-a-library/go.sum b/docs/examples/kubo-as-a-library/go.sum index 09f3bb1945d..93aa920ab28 100644 --- a/docs/examples/kubo-as-a-library/go.sum +++ b/docs/examples/kubo-as-a-library/go.sum @@ -273,8 +273,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.25.0 h1:OqNqsGZPX8zh3eFMO8Lf8EHRRnSGBMqcd github.com/ipfs-shipyard/nopfs/ipfs v0.25.0/go.mod h1:BxhUdtBgOXg1B+gAPEplkg/GpyTZY+kCMSfsJvvydqU= github.com/ipfs/bbloom v0.1.0 h1:nIWwfIE3AaG7RCDQIsrUonGCOTp7qSXzxH7ab/ss964= github.com/ipfs/bbloom v0.1.0/go.mod h1:lDy3A3i6ndgEW2z1CaRFvDi5/ZTzgM1IxA/pkL7Wgts= -github.com/ipfs/boxo v0.41.1-0.20260707130650-177b35c8ef09 h1:jl4/IHR4IRb0QOVw6vFxUL4NRnetk1V42HIdipWu+aw= -github.com/ipfs/boxo v0.41.1-0.20260707130650-177b35c8ef09/go.mod h1:mnR769LN1W7rDI6z1GBLmD15x4pvMdW0oWxik8j3y6g= +github.com/ipfs/boxo v0.41.1-0.20260714175209-5ecaf9b4bcda h1:89CHRXDh36YzWFk5zdtXEKttIRnWf0Xh7VPr9wMVWtg= +github.com/ipfs/boxo v0.41.1-0.20260714175209-5ecaf9b4bcda/go.mod h1:7afSZ65bj+XGaTgU1UgdGecbXDhUpxIS7jS3jSItDXo= github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA= github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU= github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk= @@ -339,8 +339,8 @@ github.com/ipfs/go-metrics-interface v0.3.0 h1:YwG7/Cy4R94mYDUuwsBfeziJCVm9pBMJ6 github.com/ipfs/go-metrics-interface v0.3.0/go.mod h1:OxxQjZDGocXVdyTPocns6cOLwHieqej/jos7H4POwoY= github.com/ipfs/go-peertaskqueue v0.8.3 h1:tBPpGJy+A92RqtRFq5amJn0Uuj8Pw8tXi0X3eHfHM8w= github.com/ipfs/go-peertaskqueue v0.8.3/go.mod h1:OqVync4kPOcXEGdj/LKvox9DCB5mkSBeXsPczCxLtYA= -github.com/ipfs/go-test v0.3.0 h1:0Y4Uve3tp9HI+2lIJjfOliOrOgv/YpXg/l1y3P4DEYE= -github.com/ipfs/go-test v0.3.0/go.mod h1:JK+U8pRpATZb7lsYNSJlCj3WYB3cFfWIbI6nWRM/GFk= +github.com/ipfs/go-test v0.4.0 h1:9tXekF1a80k5mCFZ4+Whc43FTtJJ7WqPz57vXezAg/E= +github.com/ipfs/go-test v0.4.0/go.mod h1:JK+U8pRpATZb7lsYNSJlCj3WYB3cFfWIbI6nWRM/GFk= github.com/ipfs/go-unixfsnode v1.10.5 h1:V34JV7fM90y+2ZUef7ToShjmwAZ8oo1yP7zrpWzC5L4= github.com/ipfs/go-unixfsnode v1.10.5/go.mod h1:u/9Ukl+XYpfKTMu+NXQqxbzAJVTwSCoyTYBGgE+JdSE= github.com/ipld/go-car/v2 v2.17.0 h1:zgjSxf/lQNYcQPX08cvb5rSdEY8sv5OOnQIsZhZMPx4= diff --git a/fuse/readonly/ipfs_test.go b/fuse/readonly/ipfs_test.go index a644ac711f1..bdff610a7f9 100644 --- a/fuse/readonly/ipfs_test.go +++ b/fuse/readonly/ipfs_test.go @@ -57,7 +57,7 @@ func testMount(t *testing.T, root fs.InodeEmbedder) string { func randObj(t *testing.T, nd *core.IpfsNode, size int64) (ipld.Node, []byte) { buf := make([]byte, size) - _, err := io.ReadFull(random.NewRand(), buf) + _, err := io.ReadFull(random.New(), buf) if err != nil { t.Fatal(err) } diff --git a/go.mod b/go.mod index 73409f11599..e21ecde996b 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/hashicorp/go-version v1.9.0 github.com/ipfs-shipyard/nopfs v0.0.14 github.com/ipfs-shipyard/nopfs/ipfs v0.25.0 - github.com/ipfs/boxo v0.41.1-0.20260707130650-177b35c8ef09 + github.com/ipfs/boxo v0.41.1-0.20260714175209-5ecaf9b4bcda github.com/ipfs/go-block-format v0.2.4 github.com/ipfs/go-cid v0.6.2 github.com/ipfs/go-cidutil v0.1.2 @@ -42,7 +42,7 @@ require ( github.com/ipfs/go-log/v2 v2.9.2 github.com/ipfs/go-metrics-interface v0.3.0 github.com/ipfs/go-metrics-prometheus v0.1.0 - github.com/ipfs/go-test v0.3.0 + github.com/ipfs/go-test v0.4.0 github.com/ipfs/go-unixfsnode v1.10.5 github.com/ipld/go-car/v2 v2.17.0 github.com/ipld/go-codec-dagpb v1.7.0 diff --git a/go.sum b/go.sum index 138bdb034fa..a6d5208a3e6 100644 --- a/go.sum +++ b/go.sum @@ -344,8 +344,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.25.0 h1:OqNqsGZPX8zh3eFMO8Lf8EHRRnSGBMqcd github.com/ipfs-shipyard/nopfs/ipfs v0.25.0/go.mod h1:BxhUdtBgOXg1B+gAPEplkg/GpyTZY+kCMSfsJvvydqU= github.com/ipfs/bbloom v0.1.0 h1:nIWwfIE3AaG7RCDQIsrUonGCOTp7qSXzxH7ab/ss964= github.com/ipfs/bbloom v0.1.0/go.mod h1:lDy3A3i6ndgEW2z1CaRFvDi5/ZTzgM1IxA/pkL7Wgts= -github.com/ipfs/boxo v0.41.1-0.20260707130650-177b35c8ef09 h1:jl4/IHR4IRb0QOVw6vFxUL4NRnetk1V42HIdipWu+aw= -github.com/ipfs/boxo v0.41.1-0.20260707130650-177b35c8ef09/go.mod h1:mnR769LN1W7rDI6z1GBLmD15x4pvMdW0oWxik8j3y6g= +github.com/ipfs/boxo v0.41.1-0.20260714175209-5ecaf9b4bcda h1:89CHRXDh36YzWFk5zdtXEKttIRnWf0Xh7VPr9wMVWtg= +github.com/ipfs/boxo v0.41.1-0.20260714175209-5ecaf9b4bcda/go.mod h1:7afSZ65bj+XGaTgU1UgdGecbXDhUpxIS7jS3jSItDXo= github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA= github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU= github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk= @@ -412,8 +412,8 @@ github.com/ipfs/go-metrics-prometheus v0.1.0 h1:bApWOHkrH3VTBHzTHrZSfq4n4weOZDzZ github.com/ipfs/go-metrics-prometheus v0.1.0/go.mod h1:2GtL525C/4yxtvSXpRJ4dnE45mCX9AS0XRa03vHx7G0= github.com/ipfs/go-peertaskqueue v0.8.3 h1:tBPpGJy+A92RqtRFq5amJn0Uuj8Pw8tXi0X3eHfHM8w= github.com/ipfs/go-peertaskqueue v0.8.3/go.mod h1:OqVync4kPOcXEGdj/LKvox9DCB5mkSBeXsPczCxLtYA= -github.com/ipfs/go-test v0.3.0 h1:0Y4Uve3tp9HI+2lIJjfOliOrOgv/YpXg/l1y3P4DEYE= -github.com/ipfs/go-test v0.3.0/go.mod h1:JK+U8pRpATZb7lsYNSJlCj3WYB3cFfWIbI6nWRM/GFk= +github.com/ipfs/go-test v0.4.0 h1:9tXekF1a80k5mCFZ4+Whc43FTtJJ7WqPz57vXezAg/E= +github.com/ipfs/go-test v0.4.0/go.mod h1:JK+U8pRpATZb7lsYNSJlCj3WYB3cFfWIbI6nWRM/GFk= github.com/ipfs/go-unixfsnode v1.10.5 h1:V34JV7fM90y+2ZUef7ToShjmwAZ8oo1yP7zrpWzC5L4= github.com/ipfs/go-unixfsnode v1.10.5/go.mod h1:u/9Ukl+XYpfKTMu+NXQqxbzAJVTwSCoyTYBGgE+JdSE= github.com/ipld/go-car/v2 v2.17.0 h1:zgjSxf/lQNYcQPX08cvb5rSdEY8sv5OOnQIsZhZMPx4= diff --git a/test/bench/bench_cli_ipfs_add/main.go b/test/bench/bench_cli_ipfs_add/main.go index 2c39ba63680..b7e92761f60 100644 --- a/test/bench/bench_cli_ipfs_add/main.go +++ b/test/bench/bench_cli_ipfs_add/main.go @@ -42,6 +42,8 @@ func compareResults() error { func benchmarkAdd(amount int64) (*testing.BenchmarkResult, error) { var benchmarkError error + seed := random.Uint64ToSeed(1) + results := testing.Benchmark(func(b *testing.B) { b.SetBytes(amount) for i := 0; i < b.N; i++ { @@ -67,7 +69,6 @@ func benchmarkAdd(amount int64) (*testing.BenchmarkResult, error) { b.Fatal(err) } - const seed = 1 f, err := os.CreateTemp("", "") if err != nil { benchmarkError = err @@ -76,7 +77,7 @@ func benchmarkAdd(amount int64) (*testing.BenchmarkResult, error) { defer os.Remove(f.Name()) randReader := &io.LimitedReader{ - R: random.NewSeededRand(seed), + R: random.NewSeeded(seed), N: amount, } if _, err := io.Copy(f, randReader); err != nil { diff --git a/test/bench/offline_add/main.go b/test/bench/offline_add/main.go index 7c00d30f409..a355d641052 100644 --- a/test/bench/offline_add/main.go +++ b/test/bench/offline_add/main.go @@ -34,6 +34,7 @@ func compareResults() error { } func benchmarkAdd(amount int64) (*testing.BenchmarkResult, error) { + seed := random.Uint64ToSeed(1) results := testing.Benchmark(func(b *testing.B) { b.SetBytes(amount) for i := 0; i < b.N; i++ { @@ -51,7 +52,6 @@ func benchmarkAdd(amount int64) (*testing.BenchmarkResult, error) { b.Fatal(err) } - const seed = 1 f, err := os.CreateTemp("", "") if err != nil { b.Fatal(err) @@ -59,7 +59,7 @@ func benchmarkAdd(amount int64) (*testing.BenchmarkResult, error) { defer os.Remove(f.Name()) randReader := &io.LimitedReader{ - R: random.NewSeededRand(seed), + R: random.NewSeeded(seed), N: amount, } _, err = io.Copy(f, randReader) diff --git a/test/cli/pins_test.go b/test/cli/pins_test.go index 8e98aa7fe7d..3246659b1af 100644 --- a/test/cli/pins_test.go +++ b/test/cli/pins_test.go @@ -223,8 +223,9 @@ func TestPins(t *testing.T) { t.Parallel() node := harness.NewT(t).NewNode().Init() - cidAStr := node.IPFSAddStr(string(random.Bytes(1000)), "--pin=false") - cidBStr := node.IPFSAddStr(string(random.Bytes(1000)), "--pin=false") + rnd := random.New() + cidAStr := node.IPFSAddStr(string(rnd.Bytes(1000)), "--pin=false") + cidBStr := node.IPFSAddStr(string(rnd.Bytes(1000)), "--pin=false") _ = node.IPFS("pin", "add", "--name", "testPin", cidAStr) @@ -251,9 +252,10 @@ func TestPins(t *testing.T) { t.Parallel() node := harness.NewT(t).NewNode().Init() - cidAStr := node.IPFSAddStr(string(random.Bytes(1000)), "--pin=false") - cidBStr := node.IPFSAddStr(string(random.Bytes(1000)), "--pin=false") - cidCStr := node.IPFSAddStr(string(random.Bytes(1000)), "--pin=false") + rnd := random.New() + cidAStr := node.IPFSAddStr(string(rnd.Bytes(1000)), "--pin=false") + cidBStr := node.IPFSAddStr(string(rnd.Bytes(1000)), "--pin=false") + cidCStr := node.IPFSAddStr(string(rnd.Bytes(1000)), "--pin=false") outA := cidAStr + " recursive testPin" outB := cidBStr + " recursive testPin" @@ -289,7 +291,8 @@ func TestPins(t *testing.T) { t.Parallel() node := harness.NewT(t).NewNode().Init() - cidStr := node.IPFSAddStr(string(random.Bytes(1000)), "--pin=false") + rnd := random.New() + cidStr := node.IPFSAddStr(string(rnd.Bytes(1000)), "--pin=false") outBefore := cidStr + " recursive A" outAfter := cidStr + " recursive B" @@ -310,8 +313,9 @@ func TestPins(t *testing.T) { t.Parallel() node := harness.NewT(t).NewNode().Init() - cidAStr := node.IPFSAddStr(string(random.Bytes(1000)), "--pin=false") - cidBStr := node.IPFSAddStr(string(random.Bytes(1000)), "--pin=false") + rnd := random.New() + cidAStr := node.IPFSAddStr(string(rnd.Bytes(1000)), "--pin=false") + cidBStr := node.IPFSAddStr(string(rnd.Bytes(1000)), "--pin=false") _ = node.IPFS("pin", "add", "--name", "testPinJson", cidAStr) diff --git a/test/dependencies/go.mod b/test/dependencies/go.mod index 04a7f0d2b33..d9d541c54e3 100644 --- a/test/dependencies/go.mod +++ b/test/dependencies/go.mod @@ -9,7 +9,7 @@ require ( github.com/golangci/golangci-lint v1.64.8 github.com/ipfs/go-cidutil v0.1.2 github.com/ipfs/go-log/v2 v2.9.2 - github.com/ipfs/go-test v0.3.0 + github.com/ipfs/go-test v0.4.0 github.com/ipfs/hang-fds v0.1.0 github.com/ipfs/iptb v1.4.1 github.com/ipfs/iptb-plugins v0.5.1 @@ -137,7 +137,7 @@ require ( github.com/huin/goupnp v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ipfs/bbloom v0.1.0 // indirect - github.com/ipfs/boxo v0.41.1-0.20260707130650-177b35c8ef09 // indirect + github.com/ipfs/boxo v0.41.1-0.20260714175209-5ecaf9b4bcda // indirect github.com/ipfs/go-bitfield v1.1.0 // indirect github.com/ipfs/go-block-format v0.2.4 // indirect github.com/ipfs/go-cid v0.6.2 // indirect diff --git a/test/dependencies/go.sum b/test/dependencies/go.sum index 9e82d4f6e0c..e4d3ad91e0f 100644 --- a/test/dependencies/go.sum +++ b/test/dependencies/go.sum @@ -301,8 +301,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/ipfs/bbloom v0.1.0 h1:nIWwfIE3AaG7RCDQIsrUonGCOTp7qSXzxH7ab/ss964= github.com/ipfs/bbloom v0.1.0/go.mod h1:lDy3A3i6ndgEW2z1CaRFvDi5/ZTzgM1IxA/pkL7Wgts= -github.com/ipfs/boxo v0.41.1-0.20260707130650-177b35c8ef09 h1:jl4/IHR4IRb0QOVw6vFxUL4NRnetk1V42HIdipWu+aw= -github.com/ipfs/boxo v0.41.1-0.20260707130650-177b35c8ef09/go.mod h1:mnR769LN1W7rDI6z1GBLmD15x4pvMdW0oWxik8j3y6g= +github.com/ipfs/boxo v0.41.1-0.20260714175209-5ecaf9b4bcda h1:89CHRXDh36YzWFk5zdtXEKttIRnWf0Xh7VPr9wMVWtg= +github.com/ipfs/boxo v0.41.1-0.20260714175209-5ecaf9b4bcda/go.mod h1:7afSZ65bj+XGaTgU1UgdGecbXDhUpxIS7jS3jSItDXo= github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA= github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU= github.com/ipfs/go-block-format v0.2.4 h1:pgsT9i8zB4YQkBIQRrBwqbQiXPogRCiQnfxd2bC4koI= @@ -339,8 +339,8 @@ github.com/ipfs/go-metrics-interface v0.3.0 h1:YwG7/Cy4R94mYDUuwsBfeziJCVm9pBMJ6 github.com/ipfs/go-metrics-interface v0.3.0/go.mod h1:OxxQjZDGocXVdyTPocns6cOLwHieqej/jos7H4POwoY= github.com/ipfs/go-peertaskqueue v0.8.3 h1:tBPpGJy+A92RqtRFq5amJn0Uuj8Pw8tXi0X3eHfHM8w= github.com/ipfs/go-peertaskqueue v0.8.3/go.mod h1:OqVync4kPOcXEGdj/LKvox9DCB5mkSBeXsPczCxLtYA= -github.com/ipfs/go-test v0.3.0 h1:0Y4Uve3tp9HI+2lIJjfOliOrOgv/YpXg/l1y3P4DEYE= -github.com/ipfs/go-test v0.3.0/go.mod h1:JK+U8pRpATZb7lsYNSJlCj3WYB3cFfWIbI6nWRM/GFk= +github.com/ipfs/go-test v0.4.0 h1:9tXekF1a80k5mCFZ4+Whc43FTtJJ7WqPz57vXezAg/E= +github.com/ipfs/go-test v0.4.0/go.mod h1:JK+U8pRpATZb7lsYNSJlCj3WYB3cFfWIbI6nWRM/GFk= github.com/ipfs/go-unixfsnode v1.10.5 h1:V34JV7fM90y+2ZUef7ToShjmwAZ8oo1yP7zrpWzC5L4= github.com/ipfs/go-unixfsnode v1.10.5/go.mod h1:u/9Ukl+XYpfKTMu+NXQqxbzAJVTwSCoyTYBGgE+JdSE= github.com/ipfs/hang-fds v0.1.0 h1:deBiFlWHsVGzJ0ZMaqscEqRM1r2O1rFZ59UiQXb1Xko= diff --git a/test/integration/addcat_test.go b/test/integration/addcat_test.go index 22d8be9be1c..51f3a53014b 100644 --- a/test/integration/addcat_test.go +++ b/test/integration/addcat_test.go @@ -28,6 +28,12 @@ var log = logging.Logger("epictest") const kSeed = 1 +var randSeed [32]byte + +func init() { + randSeed = random.Uint64ToSeed(kSeed) +} + func Test1KBInstantaneous(t *testing.T) { conf := testutil.LatencyConfig{ NetworkLatency: 0, @@ -84,8 +90,7 @@ func AddCatPowers(conf testutil.LatencyConfig, megabytesMax int64) error { } func RandomBytes(n int64) []byte { - random.SetSeed(kSeed) - return random.Bytes(int(n)) + return random.NewSeeded(randSeed).Bytes(n) } func DirectAddCat(data []byte, conf testutil.LatencyConfig) error { diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh index f0e5a1bb9e6..8f54f90dd66 100755 --- a/test/sharness/t0040-add-and-cat.sh +++ b/test/sharness/t0040-add-and-cat.sh @@ -489,7 +489,7 @@ test_add_cat_5MB() { ' test_expect_success "sha1 of the file looks ok" ' - echo "11145b8c4bc8f87ea2fcfc3d55708b8cac2aadf12862" >sha1_expected && + echo "11141d13cfb2c207591376e06bc2360741c2009b2898" >sha1_expected && multihash -a=sha1 -e=hex mountdir/bigfile >sha1_actual && test_cmp sha1_expected sha1_actual ' @@ -599,7 +599,7 @@ test_add_cat_expensive() { ' test_expect_success EXPENSIVE "sha1 of the file looks ok" ' - echo "11141e8c04d7cd019cc0acf0311a8ca6cf2c18413c96" >sha1_expected && + echo "1114acba57d18295a18b428faf88960fa47a71eb22cc" >sha1_expected && multihash -a=sha1 -e=hex mountdir/bigfile >sha1_actual && test_cmp sha1_expected sha1_actual ' @@ -623,16 +623,16 @@ test_add_cat_expensive() { ' test_expect_success EXPENSIVE "ipfs cat output hashed looks good" ' - echo "11141e8c04d7cd019cc0acf0311a8ca6cf2c18413c96" >sha1_expected && + echo "1114acba57d18295a18b428faf88960fa47a71eb22cc" >sha1_expected && test_cmp sha1_expected sha1_actual ' test_expect_success FUSE,EXPENSIVE "cat ipfs/bigfile succeeds" ' - cat "ipfs/$HASH" | multihash -a=sha1 -e=hex >sha1_actual + cat "ipfs/$HASH" | multihash -a=sha1 -e=hex >sha1_actual-Y ' test_expect_success FUSE,EXPENSIVE "cat ipfs/bigfile looks good" ' - test_cmp sha1_expected sha1_actual + test_cmp sha1_expected sha1_actual-Y ' } @@ -906,38 +906,38 @@ test_expect_success "random-data is installed" ' type random-data ' -test_add_cat_5MB "" "QmapAfmzmeWYTNztMQEhUXFcSGrsax22WRG7YN9xLdMeQq" +test_add_cat_5MB "" "QmbW8FAUE5nJ2EccaFGLQtubacZr9VP1m6KLBniL7yzXpF" -test_add_cat_5MB --raw-leaves "QmabWSFaPusmiZaaVZLhEUtHcj8CCvVeUfkBpKqAkKVMiS" +test_add_cat_5MB --raw-leaves "Qmf6a54RFHB3sAH5Beh5pha6Y8UZz22pfDKZAgmQ2UvLJH" # note: the specified hash implies that internal nodes are stored # using CidV1 and leaves are stored using raw blocks -test_add_cat_5MB --cid-version=1 "bafybeifwdkm32fmukqwh3jofm6ma76bcqvn6opxstsnzmya7utboi4cb2m" +test_add_cat_5MB --cid-version=1 "bafybeihy7ngsovmm2dqanlpjeddvs7kshb4bdwrue3pe5nsf6rkn3hg45y" # note: the specified hash implies that internal nodes are stored # using CidV1 and leaves are stored using CidV1 but using the legacy # format (i.e. not raw) -test_add_cat_5MB '--cid-version=1 --raw-leaves=false' "bafybeifq4unep5w4agr3nlynxidj2rymf6dzu6bf4ieqqildkboe5mdmne" +test_add_cat_5MB '--cid-version=1 --raw-leaves=false' "bafybeie4nox52gy5qpv5bhbrzrfgpwwdfpk257v2ixy66whvqdjd67r3fq" # note: --hash=blake2b-256 implies --cid-version=1 which implies --raw-leaves=true # the specified hash represents the leaf nodes stored as raw leaves and # encoded with the blake2b-256 hash function -test_add_cat_5MB '--hash=blake2b-256' "bafykbzacebxcnlql4oc3mtscqn32aumqkqxxv3wt7dkyrphgh6lc2gckiq6bw" +test_add_cat_5MB '--hash=blake2b-256' "bafykbzacebiss6bbf5ynrrcsweg66zau5p6w2a52scmpgcxaaeqremw5vpy22" # the specified hash represents the leaf nodes stored as protoful nodes and # encoded with the blake2b-256 hash function -test_add_cat_5MB '--hash=blake2b-256 --raw-leaves=false' "bafykbzacearibnoamkfmcagpfgk2sbgx65qftnsrh4ttd3g7ghooasfnyavme" +test_add_cat_5MB '--hash=blake2b-256 --raw-leaves=false' "bafykbzacecn3yylzcrinh2mf3kcwxrql4haddl6pb4wmnkc6wurtfqi2mghhy" -test_add_cat_expensive "" "Qma1WZKC3jad7e3F7GEDvkFdhPLyMEhKszBF4nBUCBGh6c" +test_add_cat_expensive "" "QmPYo95xiEmcqiqWpqg9iwHgcbWi7n4fQuP27xCNQLmytG" # note: the specified hash implies that internal nodes are stored # using CidV1 and leaves are stored using raw blocks -test_add_cat_expensive "--cid-version=1" "bafybeibdfw7nsmb3erhej2k6v4eopaswsf5yfv2ikweqa3qsc5no4jywqu" +test_add_cat_expensive "--cid-version=1" "bafybeidwwhjvrpu2j34ppvr2swm2u55ljcuhqzm7s5xd7rlsvlu7ny2rry" # note: --hash=blake2b-256 implies --cid-version=1 which implies --raw-leaves=true # the specified hash represents the leaf nodes stored as raw leaves and # encoded with the blake2b-256 hash function -test_add_cat_expensive '--hash=blake2b-256' "bafykbzaceduy3thhmcf6ptfqzxberlvj7sgo4uokrvd6qwrhim6r3rgcb26qi" +test_add_cat_expensive '--hash=blake2b-256' "bafykbzacebosow2qjoynvjq2qmjuhh6qgkxqwjpqqreucu5idbq3n75wobtxa" test_add_named_pipe diff --git a/test/sharness/t0043-add-w.sh b/test/sharness/t0043-add-w.sh index a0bfc279703..0568106e173 100755 --- a/test/sharness/t0043-add-w.sh +++ b/test/sharness/t0043-add-w.sh @@ -6,48 +6,48 @@ test_description="Test add -w" -add_w_m='QmbDfuW3tZ5PmAucyLBAMzVeETHCHM7Ho9CWdBvWxRGd3i' - -add_w_1='added QmP9WCV5SjQRoxoCkgywzw4q5X23rhHJJXzPQt4VbNa9M5 0h0r91 -added Qmave82G8vLbtx6JCokrrhLPpFNfWj5pbXobddiUASfpe3 ' - -add_w_12='added QmP9WCV5SjQRoxoCkgywzw4q5X23rhHJJXzPQt4VbNa9M5 0h0r91 -added QmNUiT9caQy5zXvw942UYXkjLseQLWBkf7ZJD6RCfk8JgP 951op -added QmWXoq9vUtdNxmM16kvJRgyQdi4S4gfYSjd2MsRprBXWmG ' - -add_w_d1='added QmQKZCZKKL71zcMNpFFVcWzoh5dimX45mKgUu3LhvdaCRn 3s78oa/cb5v5v -added QmPng2maSno8o659Lu2QtKg2d2L53RMahoyK6wNkifYaxY 3s78oa/cnd062l-rh -added QmX3s7jJjFQhKRuGpDA3W4BYHdCWAyL3oB6U3iSoaYxVxs 3s78oa/es3gm9ck7b -added QmSUZXb48DoNjUPpX9Jue1mUpyCghEDZY62iif1JhdofoG 3s78oa/kfo77-6i_hp0ttz -added QmdC215Wp2sH47aw6R9CLBVa5uxJB4zEag1gtsKqjYGDb5 3s78oa/p91vs5t -added QmSEGJRYb5wrJRBxNsse91YJSpmgf5ikKRtCwvGZ1V1Nc2 3s78oa -added QmS2ML7DPVisc4gQtSrwMi3qwS9eyzGR7zVdwqwRPU9rGz ' - -add_w_d1_v1='added bafkreibpfapmbmf55elpipnoofmda7xbs5spthba2srrovnchttzplmrnm fvmq97/0vz12t0yf -added bafkreihc5hdzpjwbqy6b5r2h2oxbm6mp4sx4eqll253k6f5yijsismvoxy fvmq97/2hpfk8slf0 -added bafkreihlmwk6pkk7klsmypmk2wfkgijbk7wavhtrcvgrfxvug7x5ndawge fvmq97/nda000755cd76 -added bafkreigpntro6bt4m6c5pcnmvk24qyiq3lwffhwry7k2hqtretqhfsfvqa fvmq97/nsz0wsonz -added bafkreieeznfvzr6742npktcn4ajzxujst6j2uztwfninhvic4bbvm356u4 fvmq97/pq3f6t0 -added bafybeiatm3oos62mm5hu4cmq234wipw2fjaqflq2cdqgc6i6dcgzamxwrm fvmq97 -added bafybeifp4ioszjk2377psexdhk7thcxnpaj2wls4yifsntbgxzti7ds4uy ' - -add_w_d2='added QmP9WCV5SjQRoxoCkgywzw4q5X23rhHJJXzPQt4VbNa9M5 0h0r91 -added QmPpv7rFgkBqMYKJok6kVixqJgAGkyPiX3Jrr7n9rU1gcv 1o8ef-25onywi -added QmW7zDxGpaJTRpte7uCvMA9eXJ5L274FfsFPK9pE5RShq9 2ju9tn-b09/-qw1d8j9 -added QmNNm9D3pn8NXbuYSde614qbb9xE67g9TNV6zXePgSZvHj 2ju9tn-b09/03rfc61t4qq_m -added QmUYefaFAWka9LWarDeetQFe8CCSHaAtj4JR7YToYPSJyi 2ju9tn-b09/57dl-1lbjvu -added QmcMLvVinwJsHtYxTUXEoPd8XkbuyvJNffZ85PT11cWDc2 2ju9tn-b09/t8h1_w -added QmUTZE57VoF7xqWmrrcDNtDXrEs6znTQaRwmwkawGDs1GA 2ju9tn-b09/ugqi0nmv-1 -added QmfX5q9CMquL4JnAuG4H13RXjTb9DncMfu9pvpEsWkECJk fvmq97/0vz12t0yf -added Qmdr3jR1UATLFeuoieBTHLNNwhCUJbgN5oat7U9X8TtfdZ fvmq97/2hpfk8slf0 -added QmfUKgXSiE1wCQuX3Pws9FftthJuAMXrDWhG5EhhnmA6gQ fvmq97/nda000755cd76 -added QmYM35pgHvLdKH8ssw9kJeiUY5kcjhb5h3BTiDhAgbsYYh fvmq97/nsz0wsonz -added QmNarBSVwzYjLeEjGMJqTNtRCYGCLGo6TJqd21hPi7WXFT fvmq97/pq3f6t0 -added QmUNhQpFBZvfH4JyNxiE8QY31bZDpQHMmjSRRnbRZYZ3be 2ju9tn-b09 -added QmWtZu8dv4XRK8zPmwbNjS6biqe4bGEF9J5zb51sBJCMro fvmq97 -added QmYp7QoL8wRacLn9pJftJSkiiSmNGdWb7qT5ENDW2HXBcu ' - -add_w_r='QmUerh2irM8cngqJHLGKCn4AGBSyHYAUi8i8zyVzXKNYyb' +add_w_m='QmVFBKBbdv7HoMdjTT7adMyUsTvY4tVyr6aPTgrCWyFQo6' + +add_w_1='added Qmb2LTzn7Yo2LHgmLUaHbaWuNGfVKS25sMYqK52okGa4yd 8e6j_ +added QmcwexGV5CFFN1SqQNXqBhzbC6AxtXBdFm7Dv61VtLBTHU ' + +add_w_12='added Qmb2LTzn7Yo2LHgmLUaHbaWuNGfVKS25sMYqK52okGa4yd 8e6j_ +added QmcytURLVEAaNDiNzWU5pZhL8MCTNmmiXrkF2ekPF4ZkNw ewxbo-p_ebq1k6z +added Qme6uNAJHyjjdJSHwejw4GK3fEtzrPA9rTNbBWVW8cJNqV ' + +add_w_d1='added QmReS7VZaSdf3ik6qJqcKka79hZoaZxt68RzxpeRM6vhcY efis44rh5jq69/4e9ygub65pqnd +added Qmegpr1gVLrkVeWmXCYmZVkJ3cNHcjKEi1RBRqE68UY9A7 efis44rh5jq69/eltgzx +added QmQ2szbNCuejR793HvBZ6pwpAPSTmomuCqvoUzoasqSAjw efis44rh5jq69/kv90ww6n0j +added QmaKAczxkiJFVpATJiZGnJ3eoS5wY3HhiLCFftCfgo47QM efis44rh5jq69/vrlkd8mxt8cty7 +added QmXRAAykFSGPY3DGJJHV92FvKr4UcanfhZMdTGHiPAZEad efis44rh5jq69/wn2878 +added QmUrRLM2ZVy9b553e1EDgaCKyeNq3sTFb94U7dk6F2Zzcp efis44rh5jq69 +added QmdNfMuS4Bui9esinhVCEPBvKPeCxe2694sF6AwiCLC9ix ' + +add_w_d1_v1='added bafkreic4faiiaj2arxtiifvaskyj23cvfk26mr7gx7cy7h3pbyt7c5o7yy ks-7mqkzt29b2q/b-o3l9oc +added bafkreif37syqi44bdbsfi4ewhijlmxwhr4v3mrjjdururm5igvarzdd36u ks-7mqkzt29b2q/gdntkjcg26dvu27d +added bafkreie43jg3hzmkfdwippgyd4xza3rucauu4juw6dj4smbspkdsosbhte ks-7mqkzt29b2q/lc9jj +added bafkreiekjb6ae4dr6bfa6msnnulnla6zwikfhalgduuert5uiauua36cru ks-7mqkzt29b2q/u3mk_g-o61c4x +added bafkreifsgblf5nddvqpioje77fzu3arf4d4t4nt2h5e3lgmxx5izfzcjxy ks-7mqkzt29b2q/w44jbb0oc6 +added bafybeidoqcknpakdk66xyii3vkiv7jkipu234xnw5jj6f6hjofictaasni ks-7mqkzt29b2q +added bafybeic2j5ttfehhhcti236asobqipzcb7tmuejkrcrw7ia22ykfenj5ly ' + +add_w_d2='added QmPHk2wm2iWm6qnVq3GNob4Qg6kwJJmv4fZrje4mouEeTh -ydbcn6 +added Qmb2LTzn7Yo2LHgmLUaHbaWuNGfVKS25sMYqK52okGa4yd 8e6j_ +added QmU4tJkTCtGzkmiYmrNBbEmAW7MXQEjsois3uwVfmyELPC ks-7mqkzt29b2q/b-o3l9oc +added QmW5446N9DuGrAvfxhc74cG6MPk1uoXPwZKAhXPttBZwvo ks-7mqkzt29b2q/gdntkjcg26dvu27d +added QmVLtgkve9nbJRxSv4FNL1a4X1gvmbLU7y6Xgaa9zc6GCZ ks-7mqkzt29b2q/lc9jj +added QmX4xbmXU77EkvBTV5v4FpXtV6naNkYuhV3foGasLG1FoE ks-7mqkzt29b2q/u3mk_g-o61c4x +added QmQTHSB5azu1ni3aSaZk9XCNW5suJv4QfmFJV8oM8rnSNM ks-7mqkzt29b2q/w44jbb0oc6 +added QmfSUVemMEcSaZ7r7mFvyuGaPGiRckMhrZCYhrwsyza8o8 ndmuvqny42hqhc/-q5qip +added QmXbw2ApWBFHEtibxCKDNR4vGtsPS9SHnMUNSrb3pmcfoV ndmuvqny42hqhc/f-v9 +added QmZoYh5nT8Yy8kx68c89tYetwhpF59psakvfNfkwS6jAqM ndmuvqny42hqhc/izsy8d_n0uke3s-k +added QmX2myYx9TSXmaFR8NoP7Zc2BQDUYyCYp8tPHnA8v14pux ndmuvqny42hqhc/nmg0an87ivw +added QmbpDTAwTGbhsxPD7Y3YSJUdppMRwEVtwpgaYDsJaXcTAq ndmuvqny42hqhc/y508xc5ex +added Qme3zK228nJztwRqSZShCvoxnixK7JLUSTdHJGth2aaDBX ks-7mqkzt29b2q +added QmPRfbjzfU2qW4XfFYqWMHC8YaRPjcPQ3y8qmsRgdrB1f7 ndmuvqny42hqhc +added QmexKKqpqkjcUS1xsaDv2pwPKWg8nSVeADuKk8bFd3nrZG ' + +add_w_r='QmW7rkP394QujXBQJAhgDpZ8eEYWHw9bTcpYmNU7Qs1Ugp' . lib/test-lib.sh @@ -60,99 +60,99 @@ test_add_w() { test_expect_success "random-files generates test files" ' random-files --seed 7547632 --files 5 --dirs 2 --depth 3 m && echo "$add_w_m" >expected && - ipfs add -Q -r m >actual && - test_sort_cmp expected actual + ipfs add -Q -r m >actual_w_m && + test_sort_cmp expected actual_w_m ' # test single file test_expect_success "ipfs add -w (single file) succeeds" ' - ipfs add -w m/0h0r91 >actual + ipfs add -w m/8e6j_ >actual_w_1 ' test_expect_success "ipfs add -w (single file) is correct" ' echo "$add_w_1" >expected && - test_sort_cmp expected actual + test_sort_cmp expected actual_w_1 ' # test two files together test_expect_success "ipfs add -w (multiple) succeeds" ' - ipfs add -w m/0h0r91 m/951op >actual + ipfs add -w m/8e6j_ m/ewxbo-p_ebq1k6z >actual_w_12 ' test_expect_success "ipfs add -w (multiple) is correct" ' echo "$add_w_12" >expected && - test_sort_cmp expected actual + test_sort_cmp expected actual_w_12 ' test_expect_success "ipfs add -w (multiple) succeeds" ' - ipfs add -w m/951op m/0h0r91 >actual + ipfs add -w m/ewxbo-p_ebq1k6z m/8e6j_ >actual_w_12_a ' test_expect_success "ipfs add -w (multiple) orders" ' echo "$add_w_12" >expected && - test_sort_cmp expected actual + test_sort_cmp expected actual_w_12_a ' # test a directory test_expect_success "ipfs add -w -r (dir) succeeds" ' - ipfs add -r -w m/9m7mh3u51z3b/3s78oa >actual + ipfs add -r -w m/j2x5evmf3iu_99-n/efis44rh5jq69 >actual_w_d1 ' test_expect_success "ipfs add -w -r (dir) is correct" ' echo "$add_w_d1" >expected && - test_sort_cmp expected actual + test_sort_cmp expected actual_w_d1 ' # test files and directory test_expect_success "ipfs add -w -r succeeds" ' - ipfs add -w -r m/9m7mh3u51z3b/1o8ef-25onywi \ - m/vck_-2/2ju9tn-b09 m/9m7mh3u51z3b/fvmq97 m/0h0r91 >actual + ipfs add -w -r m/j2x5evmf3iu_99-n/-ydbcn6 \ + m/phtgkon/ndmuvqny42hqhc m/j2x5evmf3iu_99-n/ks-7mqkzt29b2q m/8e6j_ >actual_w_d2 ' test_expect_success "ipfs add -w -r is correct" ' echo "$add_w_d2" >expected && - test_sort_cmp expected actual + test_sort_cmp expected actual_w_d2 ' # test -w -r m/* == -r m test_expect_success "ipfs add -w -r m/* == add -r m succeeds" ' - ipfs add -Q -w -r m/* >actual + ipfs add -Q -w -r m/* >actual_w_m2 ' test_expect_success "ipfs add -w -r m/* == add -r m is correct" ' echo "$add_w_m" >expected && - test_sort_cmp expected actual + test_sort_cmp expected actual_w_m2 ' # test repeats together test_expect_success "ipfs add -w (repeats) succeeds" ' - ipfs add -Q -w -r m/9m7mh3u51z3b/1o8ef-25onywi m/vck_-2/2ju9tn-b09 \ - m/9m7mh3u51z3b/fvmq97 m/0h0r91 m/9m7mh3u51z3b m/9m7mh3u51z3b m/0h0r91 \ - m/0h0r91 m/vck_-2/0dl083je2 \ - m/vck_-2/2ju9tn-b09/-qw1d8j9 >actual + ipfs add -Q -w -r m/j2x5evmf3iu_99-n/-ydbcn6 m/phtgkon/ndmuvqny42hqhc \ + m/j2x5evmf3iu_99-n/ks-7mqkzt29b2q m/8e6j_ m/j2x5evmf3iu_99-n m/j2x5evmf3iu_99-n m/8e6j_ \ + m/8e6j_ m/phtgkon/1g-nsct \ + m/phtgkon/ndmuvqny42hqhc/-q5qip >actual_w_r ' test_expect_success "ipfs add -w (repeats) is correct" ' echo "$add_w_r" >expected && - test_sort_cmp expected actual + test_sort_cmp expected actual_w_r ' test_expect_success "ipfs add -w -r (dir) --cid-version=1 succeeds" ' - ipfs add -r -w --cid-version=1 m/9m7mh3u51z3b/fvmq97 >actual + ipfs add -r -w --cid-version=1 m/j2x5evmf3iu_99-n/ks-7mqkzt29b2q >actual_w_d1_v1 ' test_expect_success "ipfs add -w -r (dir) --cid-version=1 is correct" ' echo "$add_w_d1_v1" >expected && - test_sort_cmp expected actual + test_sort_cmp expected actual_w_d1_v1 ' test_expect_success "ipfs add -w -r -n (dir) --cid-version=1 succeeds" ' - ipfs add -r -w -n --cid-version=1 m/9m7mh3u51z3b/fvmq97 >actual + ipfs add -r -w -n --cid-version=1 m/j2x5evmf3iu_99-n/ks-7mqkzt29b2q >actual_w_d1_v2 ' test_expect_success "ipfs add -w -r -n (dir) --cid-version=1 is correct" ' echo "$add_w_d1_v1" > expected && - test_sort_cmp expected actual + test_sort_cmp expected actual_w_d1_v2 ' } diff --git a/test/sharness/t0045-ls.sh b/test/sharness/t0045-ls.sh index ebb391d6562..14821f691e4 100755 --- a/test/sharness/t0045-ls.sh +++ b/test/sharness/t0045-ls.sh @@ -25,97 +25,97 @@ test_ls_cmd() { test_expect_success "'ipfs add' output looks good" ' cat <<-\EOF >expected_add && -added QmWUixdcx1VJtpuAgXAy4e3JPAbEoHE6VEDut5KcYcpuGN testData/d1/128 +added QmYGeKXr7Jef8FgFbrb6X2cY45od7anc2QstAJbWT2E5ak testData/d1/128 added QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN testData/d1/a -added QmZHVTX2epinyx5baTFV2L2ap9VtgbmfeFdhgntAypT5N3 testData/d2/1024 +added QmUc94gA5Vy3tp2gnBx4YnAQ3msnqDc4sdEUsZsrBV65Q3 testData/d2/1024 added QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL testData/d2/a added QmQSLRRd1Lxn6NMsWmmj2g9W3LtSRfmVAVqU3ShneLUrbn testData/d2/bad\x7fname.txt added QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH testData/f1 added QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M testData/f2 -added QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j testData/d1 -added Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW testData/d2 -added QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc testData +added QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH testData/d1 +added QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 testData/d2 +added QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My testData EOF test_cmp expected_add actual_add ' - + test_expect_success "'ipfs ls ' succeeds" ' - ipfs ls QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j >actual_ls + ipfs ls QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH >actual_ls ' test_expect_success "'ipfs ls ' output looks good" ' cat <<-\EOF >expected_ls && -QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc: -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j - d1/ -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW - d2/ +QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My: +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH - d1/ +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 - d2/ QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 5 f1 QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 5 f2 -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW: -QmZHVTX2epinyx5baTFV2L2ap9VtgbmfeFdhgntAypT5N3 1024 1024 +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6: +QmUc94gA5Vy3tp2gnBx4YnAQ3msnqDc4sdEUsZsrBV65Q3 1024 1024 QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 6 a QmQSLRRd1Lxn6NMsWmmj2g9W3LtSRfmVAVqU3ShneLUrbn 8 bad\x7fname.txt -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j: -QmWUixdcx1VJtpuAgXAy4e3JPAbEoHE6VEDut5KcYcpuGN 128 128 +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH: +QmYGeKXr7Jef8FgFbrb6X2cY45od7anc2QstAJbWT2E5ak 128 128 QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 6 a EOF test_cmp expected_ls actual_ls ' test_expect_success "'ipfs ls --size=false ' succeeds" ' - ipfs ls --size=false QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j >actual_ls + ipfs ls --size=false QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH >actual_ls ' test_expect_success "'ipfs ls ' output looks good" ' cat <<-\EOF >expected_ls && -QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc: -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j d1/ -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW d2/ +QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My: +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH d1/ +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 d2/ QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH f1 QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M f2 -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW: -QmZHVTX2epinyx5baTFV2L2ap9VtgbmfeFdhgntAypT5N3 1024 +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6: +QmUc94gA5Vy3tp2gnBx4YnAQ3msnqDc4sdEUsZsrBV65Q3 1024 QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL a QmQSLRRd1Lxn6NMsWmmj2g9W3LtSRfmVAVqU3ShneLUrbn bad\x7fname.txt -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j: -QmWUixdcx1VJtpuAgXAy4e3JPAbEoHE6VEDut5KcYcpuGN 128 +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH: +QmYGeKXr7Jef8FgFbrb6X2cY45od7anc2QstAJbWT2E5ak 128 QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN a EOF test_cmp expected_ls actual_ls ' test_expect_success "'ipfs ls --headers ' succeeds" ' - ipfs ls --headers QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j >actual_ls_headers + ipfs ls --headers QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH >actual_ls_headers ' test_expect_success "'ipfs ls --headers ' output looks good" ' cat <<-\EOF >expected_ls_headers && -QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc: +QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My: Hash Size Name -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j - d1/ -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW - d2/ +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH - d1/ +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 - d2/ QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 5 f1 QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 5 f2 -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW: +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6: Hash Size Name -QmZHVTX2epinyx5baTFV2L2ap9VtgbmfeFdhgntAypT5N3 1024 1024 +QmUc94gA5Vy3tp2gnBx4YnAQ3msnqDc4sdEUsZsrBV65Q3 1024 1024 QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 6 a QmQSLRRd1Lxn6NMsWmmj2g9W3LtSRfmVAVqU3ShneLUrbn 8 bad\x7fname.txt -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j: +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH: Hash Size Name -QmWUixdcx1VJtpuAgXAy4e3JPAbEoHE6VEDut5KcYcpuGN 128 128 +QmYGeKXr7Jef8FgFbrb6X2cY45od7anc2QstAJbWT2E5ak 128 128 QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 6 a EOF test_cmp expected_ls_headers actual_ls_headers ' test_expect_success "'ipfs ls --size=false --cid-base=base32 ' succeeds" ' - ipfs ls --size=false --cid-base=base32 $(cid-fmt -v 1 -b base32 %s QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j) >actual_ls_base32 + ipfs ls --size=false --cid-base=base32 $(cid-fmt -v 1 -b base32 %s QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH) >actual_ls_base32 ' test_expect_success "'ipfs ls --size=false --cid-base=base32 ' output looks good" ' @@ -141,90 +141,90 @@ test_ls_cmd_streaming() { test_expect_success "'ipfs add' output looks good" ' cat <<-\EOF >expected_add && -added QmWUixdcx1VJtpuAgXAy4e3JPAbEoHE6VEDut5KcYcpuGN testData/d1/128 +added QmYGeKXr7Jef8FgFbrb6X2cY45od7anc2QstAJbWT2E5ak testData/d1/128 added QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN testData/d1/a -added QmZHVTX2epinyx5baTFV2L2ap9VtgbmfeFdhgntAypT5N3 testData/d2/1024 +added QmUc94gA5Vy3tp2gnBx4YnAQ3msnqDc4sdEUsZsrBV65Q3 testData/d2/1024 added QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL testData/d2/a added QmQSLRRd1Lxn6NMsWmmj2g9W3LtSRfmVAVqU3ShneLUrbn testData/d2/bad\x7fname.txt added QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH testData/f1 added QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M testData/f2 -added QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j testData/d1 -added Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW testData/d2 -added QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc testData +added QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH testData/d1 +added QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 testData/d2 +added QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My testData EOF test_cmp expected_add actual_add ' test_expect_success "'ipfs ls --stream ' succeeds" ' - ipfs ls --stream QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j >actual_ls_stream + ipfs ls --stream QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH >actual_ls_stream ' test_expect_success "'ipfs ls --stream ' output looks good" ' cat <<-\EOF >expected_ls_stream && -QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc: -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j - d1/ -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW - d2/ +QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My: +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH - d1/ +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 - d2/ QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 5 f1 QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 5 f2 -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW: -QmZHVTX2epinyx5baTFV2L2ap9VtgbmfeFdhgntAypT5N3 1024 1024 +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6: +QmUc94gA5Vy3tp2gnBx4YnAQ3msnqDc4sdEUsZsrBV65Q3 1024 1024 QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 6 a QmQSLRRd1Lxn6NMsWmmj2g9W3LtSRfmVAVqU3ShneLUrbn 8 bad\x7fname.txt -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j: -QmWUixdcx1VJtpuAgXAy4e3JPAbEoHE6VEDut5KcYcpuGN 128 128 +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH: +QmYGeKXr7Jef8FgFbrb6X2cY45od7anc2QstAJbWT2E5ak 128 128 QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 6 a EOF test_cmp expected_ls_stream actual_ls_stream ' test_expect_success "'ipfs ls --size=false --stream ' succeeds" ' - ipfs ls --size=false --stream QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j >actual_ls_stream + ipfs ls --size=false --stream QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH >actual_ls_stream ' test_expect_success "'ipfs ls --size=false --stream ' output looks good" ' cat <<-\EOF >expected_ls_stream && -QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc: -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j d1/ -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW d2/ +QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My: +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH d1/ +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 d2/ QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH f1 QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M f2 -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW: -QmZHVTX2epinyx5baTFV2L2ap9VtgbmfeFdhgntAypT5N3 1024 +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6: +QmUc94gA5Vy3tp2gnBx4YnAQ3msnqDc4sdEUsZsrBV65Q3 1024 QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL a QmQSLRRd1Lxn6NMsWmmj2g9W3LtSRfmVAVqU3ShneLUrbn bad\x7fname.txt -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j: -QmWUixdcx1VJtpuAgXAy4e3JPAbEoHE6VEDut5KcYcpuGN 128 +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH: +QmYGeKXr7Jef8FgFbrb6X2cY45od7anc2QstAJbWT2E5ak 128 QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN a EOF test_cmp expected_ls_stream actual_ls_stream ' test_expect_success "'ipfs ls --stream --headers ' succeeds" ' - ipfs ls --stream --headers QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j >actual_ls_stream_headers + ipfs ls --stream --headers QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH >actual_ls_stream_headers ' test_expect_success "'ipfs ls --stream --headers ' output looks good" ' cat <<-\EOF >expected_ls_stream_headers && -QmR5UuxvF2ALd2GRGMCNg1GDiuuvcAyEkQaCV9fNkevWuc: +QmYC14BmpHUBMttbWaqbdR81RMcZfSLau6PSazhpRWi1My: Hash Size Name -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j - d1/ -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW - d2/ +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH - d1/ +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6 - d2/ QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 5 f1 QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 5 f2 -Qmapxr4zxxUjoUFzyggydRZDkcJknjbtahYFKokbBAVghW: +QmZX7bVCyEuxB6Mzm33yP77PQVuSFvveugDdenzH2yHnd6: Hash Size Name -QmZHVTX2epinyx5baTFV2L2ap9VtgbmfeFdhgntAypT5N3 1024 1024 +QmUc94gA5Vy3tp2gnBx4YnAQ3msnqDc4sdEUsZsrBV65Q3 1024 1024 QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 6 a QmQSLRRd1Lxn6NMsWmmj2g9W3LtSRfmVAVqU3ShneLUrbn 8 bad\x7fname.txt -QmWWEQhcLufF3qPmmbUjqH7WVWBT9JrGJwPiVTryCoBs2j: +QmXQKyr8cT6erZHVqcBBASydmkSF9CnkC8AnTV8UhimExH: Hash Size Name -QmWUixdcx1VJtpuAgXAy4e3JPAbEoHE6VEDut5KcYcpuGN 128 128 +QmYGeKXr7Jef8FgFbrb6X2cY45od7anc2QstAJbWT2E5ak 128 128 QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 6 a EOF test_cmp expected_ls_stream_headers actual_ls_stream_headers @@ -246,19 +246,19 @@ test_ls_object() { test_expect_success "ipfs add medium size file then 'ipfs ls --size=false' works as expected" ' random-data -size=500000 -seed=2 > somefile && HASH=$(ipfs add somefile -q) && - echo "QmWJuiG6dhfwo3KXxCc9gkdizoMoXbLMCDiTTZgEhSmyyo " > ls-expect && - echo "QmNPxtpjhoXMRVKm4oSwcJaS4fck5FR4LufPd5KJr4jYhm " >> ls-expect && - ipfs ls --size=false $HASH > ls-actual && - test_cmp ls-actual ls-expect + echo "QmcNiEfXLxVV1pE3CBvDq4U9Bt23etJxxkeV84ZmLgdpFM " > ls-expect && + echo "QmUE5xKYYnTh5mBCu7vq53XyKMJoe5VHN3GfrQFs8NvNYV " >> ls-expect && + ipfs ls --size=false $HASH > ls-actual-1 && + test_cmp ls-actual-1 ls-expect ' test_expect_success "ipfs add medium size file then 'ipfs ls' works as expected" ' random-data -size=500000 -seed=2 > somefile && HASH=$(ipfs add somefile -q) && - echo "QmWJuiG6dhfwo3KXxCc9gkdizoMoXbLMCDiTTZgEhSmyyo 262144 " > ls-expect && - echo "QmNPxtpjhoXMRVKm4oSwcJaS4fck5FR4LufPd5KJr4jYhm 237856 " >> ls-expect && - ipfs ls $HASH > ls-actual && - test_cmp ls-actual ls-expect + echo "QmcNiEfXLxVV1pE3CBvDq4U9Bt23etJxxkeV84ZmLgdpFM 262144 " > ls-expect && + echo "QmUE5xKYYnTh5mBCu7vq53XyKMJoe5VHN3GfrQFs8NvNYV 237856 " >> ls-expect && + ipfs ls $HASH > ls-actual-2 && + test_cmp ls-actual-2 ls-expect ' } diff --git a/test/sharness/t0087-repo-robust-gc.sh b/test/sharness/t0087-repo-robust-gc.sh index 453e6a6cce1..ff3b58818e1 100755 --- a/test/sharness/t0087-repo-robust-gc.sh +++ b/test/sharness/t0087-repo-robust-gc.sh @@ -100,11 +100,11 @@ test_gc_robust_part2() { HASH2=`ipfs add -q afile` ' - LEAF1=QmcNNR6JSCUhJ9nyoVQgBhABPgcgdsuYJgdSB1f2g6BF5c - LEAF1FILE=.ipfs/blocks/RA/CIQNA5C3BLRUX3LZ7X6UTOV3KSHLARNXVDK3W5KUO6GVHNRP4SGLRAY.data + LEAF1=QmdNm2i5YeSuFN4SeeuJMUU4v9BRnqYGWoF8CTggY2yr62 + LEAF1FILE=.ipfs/blocks/U5/CIQN62M4YVUXIIJYGHNISR7NYPNNFWCB2VMFFR5IVPECASFAIKD3U5Y.data - LEAF2=QmPvtiBLgwuwF2wyf9VL8PaYgSt1XwGJ2Yu4AscRGEQvqR - LEAF2FILE=.ipfs/blocks/RN/CIQBPIKEATBI7TIHVYRQJZAKEWF2H22PXW3A7LCEPB6MFFL7IA2CRNA.data + LEAF2=QmbEBRZ2tKn5PFJPeix4fjQ4PbKYHwQ5zjsN3NGUCsiB7F + LEAF2FILE=.ipfs/blocks/G6/CIQL674X5ZST3LBHCQEI7XFQU3KCDTQ2VZ2VROXTMXZD52ZR25R6G6Q.data test_expect_success "add some additional unpinned content" ' diff --git a/test/sharness/t0270-filestore.sh b/test/sharness/t0270-filestore.sh index fc377c2d264..0ca177a98f1 100755 --- a/test/sharness/t0270-filestore.sh +++ b/test/sharness/t0270-filestore.sh @@ -13,7 +13,7 @@ test_expect_success "create a dataset" ' random-files -seed=483 -depth=3 -dirs=4 -files=6 -filesize=1000000 somedir > /dev/null ' -EXPHASH="QmXKtATsEt42CF5JoSsmzJstrvwEB5P89YQtdX4mdf9E3M" +EXPHASH="QmVgyYJehnfssTZuUqemyegiZmLiuNcxBWGGxBYaN2VD4x" get_repo_size() { disk_usage "$IPFS_PATH" diff --git a/test/sharness/t0271-filestore-utils.sh b/test/sharness/t0271-filestore-utils.sh index 5f7111bddfa..91cf1528dab 100755 --- a/test/sharness/t0271-filestore-utils.sh +++ b/test/sharness/t0271-filestore-utils.sh @@ -35,46 +35,46 @@ test_init() { test_init_dataset } -EXPHASH="QmXqfraAT3U8ct14PPPXcFkWyvmqUZazLdo29GXTKSHkP4" +EXPHASH="QmT8nut4Y5pHXUftaX7PC7QcojAQfYsjiLMoxwdc7bNS7p" cat < ls_expect_file_order -bafkreidx7ivgllulfkzyoo4oa7dfrg4mjmudg2qgdivoooj4s7lh3m5nqu 1000 somedir/file1 0 -bafkreic2wqrsyr3y3qgzbvufen2w25r3p3zljckqyxkpcagsxz3zdcosd4 10000 somedir/file2 0 -bafkreiemzfmzws23c2po4m6deiueknqfty7r3voes3e3zujmobrooc2ngm 262144 somedir/file3 0 -bafkreihgm53yhxn427lnfdwhqgpawc62qejog7gega5kqb6uwbyhjm47hu 262144 somedir/file3 262144 -bafkreigl2pjptgxz6cexcnua56zc5dwsyrc4ph2eulmcb634oes6gzvmuy 262144 somedir/file3 524288 -bafkreifjcthslybjizk36xffcsb32fsbguxz3ptkl7723wz4u3qikttmam 213568 somedir/file3 786432 +bafkreihed5ipyj3uenaem5zroilgdrhp4lvs7c2r6ldgcd7is66xj6izmi 1000 somedir/file1 0 +bafkreidfpbh7afcrsl4bc67qnmrtiksdqoxdto7tug5zo7bkh3vq46svs4 10000 somedir/file2 0 +bafkreihj5dckiavi3e3hpyxy544aewbne3gca2synmo6bpgmx6ezitklyq 262144 somedir/file3 0 +bafkreigfefue3rninmokrkyuho5dvrj7sjfvzunztmqusnfms4jpjkg3sq 262144 somedir/file3 262144 +bafkreid4ozonym3z5tm5rm2cli5fmzudkcwnazzhbgu2k6kpbj5qj27mha 262144 somedir/file3 524288 +bafkreiap7vddw56ggaod7d7kot4s3tvcc6aidlyoqzp4wuqp7c63zsttw4 213568 somedir/file3 786432 EOF sort < ls_expect_file_order > ls_expect_key_order -FILE1_HASH=bafkreidx7ivgllulfkzyoo4oa7dfrg4mjmudg2qgdivoooj4s7lh3m5nqu -FILE2_HASH=bafkreic2wqrsyr3y3qgzbvufen2w25r3p3zljckqyxkpcagsxz3zdcosd4 -FILE3_HASH=QmYEZtRGGk8rgM8MetegLLRHMKskPCg7zWpmQQAo3cQiN5 +FILE1_HASH=bafkreihed5ipyj3uenaem5zroilgdrhp4lvs7c2r6ldgcd7is66xj6izmi +FILE2_HASH=bafkreidfpbh7afcrsl4bc67qnmrtiksdqoxdto7tug5zo7bkh3vq46svs4 +FILE3_HASH=QmWtHwhJ3RKxJpdv7M99MmF2g2G882LKLKFphYmCnaWre2 cat < verify_expect_file_order -ok bafkreidx7ivgllulfkzyoo4oa7dfrg4mjmudg2qgdivoooj4s7lh3m5nqu 1000 somedir/file1 0 -ok bafkreic2wqrsyr3y3qgzbvufen2w25r3p3zljckqyxkpcagsxz3zdcosd4 10000 somedir/file2 0 -ok bafkreiemzfmzws23c2po4m6deiueknqfty7r3voes3e3zujmobrooc2ngm 262144 somedir/file3 0 -ok bafkreihgm53yhxn427lnfdwhqgpawc62qejog7gega5kqb6uwbyhjm47hu 262144 somedir/file3 262144 -ok bafkreigl2pjptgxz6cexcnua56zc5dwsyrc4ph2eulmcb634oes6gzvmuy 262144 somedir/file3 524288 -ok bafkreifjcthslybjizk36xffcsb32fsbguxz3ptkl7723wz4u3qikttmam 213568 somedir/file3 786432 +ok bafkreihed5ipyj3uenaem5zroilgdrhp4lvs7c2r6ldgcd7is66xj6izmi 1000 somedir/file1 0 +ok bafkreidfpbh7afcrsl4bc67qnmrtiksdqoxdto7tug5zo7bkh3vq46svs4 10000 somedir/file2 0 +ok bafkreihj5dckiavi3e3hpyxy544aewbne3gca2synmo6bpgmx6ezitklyq 262144 somedir/file3 0 +ok bafkreigfefue3rninmokrkyuho5dvrj7sjfvzunztmqusnfms4jpjkg3sq 262144 somedir/file3 262144 +ok bafkreid4ozonym3z5tm5rm2cli5fmzudkcwnazzhbgu2k6kpbj5qj27mha 262144 somedir/file3 524288 +ok bafkreiap7vddw56ggaod7d7kot4s3tvcc6aidlyoqzp4wuqp7c63zsttw4 213568 somedir/file3 786432 EOF sort < verify_expect_file_order > verify_expect_key_order cat < verify_rm_expect -ok bafkreic2wqrsyr3y3qgzbvufen2w25r3p3zljckqyxkpcagsxz3zdcosd4 10000 somedir/file2 0 keep -ok bafkreidx7ivgllulfkzyoo4oa7dfrg4mjmudg2qgdivoooj4s7lh3m5nqu 1000 somedir/file1 0 keep -changed bafkreiemzfmzws23c2po4m6deiueknqfty7r3voes3e3zujmobrooc2ngm 262144 somedir/file3 0 remove -changed bafkreifjcthslybjizk36xffcsb32fsbguxz3ptkl7723wz4u3qikttmam 213568 somedir/file3 786432 remove -changed bafkreigl2pjptgxz6cexcnua56zc5dwsyrc4ph2eulmcb634oes6gzvmuy 262144 somedir/file3 524288 remove -changed bafkreihgm53yhxn427lnfdwhqgpawc62qejog7gega5kqb6uwbyhjm47hu 262144 somedir/file3 262144 remove +changed bafkreiap7vddw56ggaod7d7kot4s3tvcc6aidlyoqzp4wuqp7c63zsttw4 213568 somedir/file3 786432 remove +ok bafkreidfpbh7afcrsl4bc67qnmrtiksdqoxdto7tug5zo7bkh3vq46svs4 10000 somedir/file2 0 keep +changed bafkreid4ozonym3z5tm5rm2cli5fmzudkcwnazzhbgu2k6kpbj5qj27mha 262144 somedir/file3 524288 remove +changed bafkreigfefue3rninmokrkyuho5dvrj7sjfvzunztmqusnfms4jpjkg3sq 262144 somedir/file3 262144 remove +ok bafkreihed5ipyj3uenaem5zroilgdrhp4lvs7c2r6ldgcd7is66xj6izmi 1000 somedir/file1 0 keep +changed bafkreihj5dckiavi3e3hpyxy544aewbne3gca2synmo6bpgmx6ezitklyq 262144 somedir/file3 0 remove EOF cat < verify_after_rm_expect -ok bafkreic2wqrsyr3y3qgzbvufen2w25r3p3zljckqyxkpcagsxz3zdcosd4 10000 somedir/file2 0 -ok bafkreidx7ivgllulfkzyoo4oa7dfrg4mjmudg2qgdivoooj4s7lh3m5nqu 1000 somedir/file1 0 +ok bafkreidfpbh7afcrsl4bc67qnmrtiksdqoxdto7tug5zo7bkh3vq46svs4 10000 somedir/file2 0 +ok bafkreihed5ipyj3uenaem5zroilgdrhp4lvs7c2r6ldgcd7is66xj6izmi 1000 somedir/file1 0 EOF IPFS_CMD="ipfs" @@ -240,30 +240,30 @@ test_filestore_rm_bad_blocks ## base32 ## -EXPHASH="bafybeienfbjfbywu5y44i5qm4wxajblgy5a6xuc4eepjaw5fq223wwsy3m" +EXPHASH="bafybeichic6xnxoz63r5kk736bxskyfstt4bdqiqlmfy3kkp7modsf2v64" cat < ls_expect_file_order -bafkreidx7ivgllulfkzyoo4oa7dfrg4mjmudg2qgdivoooj4s7lh3m5nqu 1000 somedir/file1 0 -bafkreic2wqrsyr3y3qgzbvufen2w25r3p3zljckqyxkpcagsxz3zdcosd4 10000 somedir/file2 0 -bafkreiemzfmzws23c2po4m6deiueknqfty7r3voes3e3zujmobrooc2ngm 262144 somedir/file3 0 -bafkreihgm53yhxn427lnfdwhqgpawc62qejog7gega5kqb6uwbyhjm47hu 262144 somedir/file3 262144 -bafkreigl2pjptgxz6cexcnua56zc5dwsyrc4ph2eulmcb634oes6gzvmuy 262144 somedir/file3 524288 -bafkreifjcthslybjizk36xffcsb32fsbguxz3ptkl7723wz4u3qikttmam 213568 somedir/file3 786432 +bafkreihed5ipyj3uenaem5zroilgdrhp4lvs7c2r6ldgcd7is66xj6izmi 1000 somedir/file1 0 +bafkreidfpbh7afcrsl4bc67qnmrtiksdqoxdto7tug5zo7bkh3vq46svs4 10000 somedir/file2 0 +bafkreihj5dckiavi3e3hpyxy544aewbne3gca2synmo6bpgmx6ezitklyq 262144 somedir/file3 0 +bafkreigfefue3rninmokrkyuho5dvrj7sjfvzunztmqusnfms4jpjkg3sq 262144 somedir/file3 262144 +bafkreid4ozonym3z5tm5rm2cli5fmzudkcwnazzhbgu2k6kpbj5qj27mha 262144 somedir/file3 524288 +bafkreiap7vddw56ggaod7d7kot4s3tvcc6aidlyoqzp4wuqp7c63zsttw4 213568 somedir/file3 786432 EOF sort < ls_expect_file_order > ls_expect_key_order -FILE1_HASH=bafkreidx7ivgllulfkzyoo4oa7dfrg4mjmudg2qgdivoooj4s7lh3m5nqu -FILE2_HASH=bafkreic2wqrsyr3y3qgzbvufen2w25r3p3zljckqyxkpcagsxz3zdcosd4 -FILE3_HASH=bafybeietaxxjghilcjhc2m4zcmicm7yjvkjdfkamc3ct2hq4gmsb3shqsi +FILE1_HASH=bafkreihed5ipyj3uenaem5zroilgdrhp4lvs7c2r6ldgcd7is66xj6izmi +FILE2_HASH=bafkreidfpbh7afcrsl4bc67qnmrtiksdqoxdto7tug5zo7bkh3vq46svs4 +FILE3_HASH=bafybeid67cm7p4m75octeh54es3un5me5hr7udz6wchlek2mfz3tfllmx4 cat < verify_expect_file_order -ok bafkreidx7ivgllulfkzyoo4oa7dfrg4mjmudg2qgdivoooj4s7lh3m5nqu 1000 somedir/file1 0 -ok bafkreic2wqrsyr3y3qgzbvufen2w25r3p3zljckqyxkpcagsxz3zdcosd4 10000 somedir/file2 0 -ok bafkreiemzfmzws23c2po4m6deiueknqfty7r3voes3e3zujmobrooc2ngm 262144 somedir/file3 0 -ok bafkreihgm53yhxn427lnfdwhqgpawc62qejog7gega5kqb6uwbyhjm47hu 262144 somedir/file3 262144 -ok bafkreigl2pjptgxz6cexcnua56zc5dwsyrc4ph2eulmcb634oes6gzvmuy 262144 somedir/file3 524288 -ok bafkreifjcthslybjizk36xffcsb32fsbguxz3ptkl7723wz4u3qikttmam 213568 somedir/file3 786432 +ok bafkreihed5ipyj3uenaem5zroilgdrhp4lvs7c2r6ldgcd7is66xj6izmi 1000 somedir/file1 0 +ok bafkreidfpbh7afcrsl4bc67qnmrtiksdqoxdto7tug5zo7bkh3vq46svs4 10000 somedir/file2 0 +ok bafkreihj5dckiavi3e3hpyxy544aewbne3gca2synmo6bpgmx6ezitklyq 262144 somedir/file3 0 +ok bafkreigfefue3rninmokrkyuho5dvrj7sjfvzunztmqusnfms4jpjkg3sq 262144 somedir/file3 262144 +ok bafkreid4ozonym3z5tm5rm2cli5fmzudkcwnazzhbgu2k6kpbj5qj27mha 262144 somedir/file3 524288 +ok bafkreiap7vddw56ggaod7d7kot4s3tvcc6aidlyoqzp4wuqp7c63zsttw4 213568 somedir/file3 786432 EOF sort < verify_expect_file_order > verify_expect_key_order diff --git a/test/sharness/t0272-urlstore.sh b/test/sharness/t0272-urlstore.sh index 47e95a8ca32..872b30f9712 100755 --- a/test/sharness/t0272-urlstore.sh +++ b/test/sharness/t0272-urlstore.sh @@ -69,9 +69,9 @@ test_urlstore() { ' cat < ls_expect -bafkreiconmdoujderxi757nf4wjpo4ukbhlo6mmxs6pg3yl53ln3ykldvi 2222 http://127.0.0.1:$GWAY_PORT/ipfs/QmUNEBSK2uPLSZU3Dj6XbSHjdGze4huWxESx2R4Ef1cKRW 0 -bafkreifybqsfcheqkxzlhuuvoi3u6wz42kic4yqohvkia2i5fg3mpkqt3i 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmTgZc5bhTHUcqGN8rRP9oTJBv1UeJVWufPMPiUfbP9Ghs 0 -bafkreigxuuyoickqhwxu4kjckmgfqb7ygd426qiakryvvstixy523imym4 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmTgZc5bhTHUcqGN8rRP9oTJBv1UeJVWufPMPiUfbP9Ghs 262144 +bafkreiboutgcyqmypfgivgtv6myrgzetgxqmifnzsk32kwrqgo3r2qdiue 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmXCpfK6wwEeFCHDFcXgLsg8njzLhF81iDEvkka75vVdGR 262144 +bafkreic57mjykimhyhgce6ool4y4jayrb43bqk5c4frywn6yxa4k724ll4 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmXCpfK6wwEeFCHDFcXgLsg8njzLhF81iDEvkka75vVdGR 0 +bafkreihlljddclccvh7zvctdmeqgpnvmw3jponnfapm4r6o7tamektsz5a 2222 http://127.0.0.1:$GWAY_PORT/ipfs/QmY7HZ3cPJPxzjMZeixDtbvEk8eyExVFDR189Dpavcoqyg 0 EOF test_expect_success "ipfs filestore ls works with urls" ' @@ -80,9 +80,9 @@ EOF ' cat < verify_expect -ok bafkreifybqsfcheqkxzlhuuvoi3u6wz42kic4yqohvkia2i5fg3mpkqt3i 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmTgZc5bhTHUcqGN8rRP9oTJBv1UeJVWufPMPiUfbP9Ghs 0 -ok bafkreigxuuyoickqhwxu4kjckmgfqb7ygd426qiakryvvstixy523imym4 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmTgZc5bhTHUcqGN8rRP9oTJBv1UeJVWufPMPiUfbP9Ghs 262144 -ok bafkreiconmdoujderxi757nf4wjpo4ukbhlo6mmxs6pg3yl53ln3ykldvi 2222 http://127.0.0.1:$GWAY_PORT/ipfs/QmUNEBSK2uPLSZU3Dj6XbSHjdGze4huWxESx2R4Ef1cKRW 0 +ok bafkreiboutgcyqmypfgivgtv6myrgzetgxqmifnzsk32kwrqgo3r2qdiue 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmXCpfK6wwEeFCHDFcXgLsg8njzLhF81iDEvkka75vVdGR 262144 +ok bafkreic57mjykimhyhgce6ool4y4jayrb43bqk5c4frywn6yxa4k724ll4 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmXCpfK6wwEeFCHDFcXgLsg8njzLhF81iDEvkka75vVdGR 0 +ok bafkreihlljddclccvh7zvctdmeqgpnvmw3jponnfapm4r6o7tamektsz5a 2222 http://127.0.0.1:$GWAY_PORT/ipfs/QmY7HZ3cPJPxzjMZeixDtbvEk8eyExVFDR189Dpavcoqyg 0 EOF test_expect_success "ipfs filestore verify works with urls" ' @@ -116,8 +116,8 @@ EOF ' cat < verify_expect_2 -error bafkreifybqsfcheqkxzlhuuvoi3u6wz42kic4yqohvkia2i5fg3mpkqt3i 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmTgZc5bhTHUcqGN8rRP9oTJBv1UeJVWufPMPiUfbP9Ghs 0 -error bafkreigxuuyoickqhwxu4kjckmgfqb7ygd426qiakryvvstixy523imym4 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmTgZc5bhTHUcqGN8rRP9oTJBv1UeJVWufPMPiUfbP9Ghs 262144 +error bafkreiboutgcyqmypfgivgtv6myrgzetgxqmifnzsk32kwrqgo3r2qdiue 237856 http://127.0.0.1:$GWAY_PORT/ipfs/QmXCpfK6wwEeFCHDFcXgLsg8njzLhF81iDEvkka75vVdGR 262144 +error bafkreic57mjykimhyhgce6ool4y4jayrb43bqk5c4frywn6yxa4k724ll4 262144 http://127.0.0.1:$GWAY_PORT/ipfs/QmXCpfK6wwEeFCHDFcXgLsg8njzLhF81iDEvkka75vVdGR 0 EOF test_expect_success "ipfs filestore verify is correct" '