swarm: Use pseudo-random instead of crypto-random for test files content generation #18083
Conversation
nizsheanez
requested review from
holisticode,
janos,
acud,
nagydani and
zelig
as code owners
nizsheanez
force-pushed
the
storage-test-random-data-gen-speedup
branch
from
df6615b to
d05871c
Compare
| } | ||
| defer tmp.Close() | ||
| defer os.Remove(tmp.Name()) | ||
| tmpFileName := testutil.TempFileWithContent(t, data) |
There was a problem hiding this comment.
you're writing different data here now. Is that an issue?
There was a problem hiding this comment.
No. There is existing data constant in cmd/swarm/access_test.go - data variable was shadowed in this function, but had same value. I cleanup couple more places to reuse that constant.
| @@ -530,7 +529,8 @@ func testDeliveryFromNodes(t *testing.T, nodes, conns, chunkCount int, skipCheck | |||
| //now we can actually upload a (random) file to the round-robin store | |||
| size := chunkCount * chunkSize | |||
| log.Debug("Storing data to file store") | |||
| fileHash, wait, err := roundRobinFileStore.Store(ctx, io.LimitReader(crand.Reader, int64(size)), int64(size), false) | |||
| b := testutil.RandomBytes(1, size) | |||
| fileHash, wait, err := roundRobinFileStore.Store(ctx, bytes.NewReader(b), int64(size), false) | |||
There was a problem hiding this comment.
Why not use testutil.RandomReader() in this case? (there are more of these cases further down the diff)
There was a problem hiding this comment.
Fixed everywhere except. swarm/storage/filestore_test.go:testFileStoreRandom - this test looks a bit weird for me. newTestDbStore using ioutil.TempDir inside, but test cleanup /tmp folder. Also i'm not sure why test writing files like /tmp/slice.bzz.16M. Looks like this test need to cleanup, I prefer to do it separately.
There was a problem hiding this comment.
you mean tmp/bzz? I agree, there's something not too obvious about that test. And yes, it leaves behind garbage. Please fix. I'm fine with separate PR for that.
…m, swarm/storage, swarm/storage/encryption, swarm/testutil: use pseudo-random instead of crypto-random for test files content generation - Replace "crypto/rand" to "math/rand" for files content generation - Remove swarm/network_test.go.Shuffle and swarm/btm/btm_test.go.Shuffle - because go1.9 support dropped (see ethereum/go-ethereum#17807 and comments to swarm/network_test.go.Shuffle)
nizsheanez
force-pushed
the
storage-test-random-data-gen-speedup
branch
from
d05871c to
7763017
Compare
Related to CI speedup: #17854
Changes has been reviewed in and closes ethersphere/swarm#959
In this PR: