cmd/swarm/swarm-smoke: sliding window test (#18967)

(cherry picked from commit b91bf08876ca4da0c2a843a9ed3e88d64427cfb8)

1 files changed, 8 insertions, 47 deletions

diff --git a/cmd/swarm/swarm-smoke/upload_speed.go b/cmd/swarm/swarm-smoke/upload_speed.go
index 4a355baf8..943c93240 100644
--- a/cmd/swarm/swarm-smoke/upload_speed.go
+++ b/cmd/swarm/swarm-smoke/upload_speed.go
@@ -17,54 +17,18 @@
 package main
 
 import (
-	"bytes"
+	"crypto/md5"
+	crand "crypto/rand"
 	"fmt"
-	"os"
+	"io"
 	"time"
 
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
-	"github.com/ethereum/go-ethereum/swarm/testutil"
 
 	cli "gopkg.in/urfave/cli.v1"
 )
 
-var endpoint string
-
-//just use the first endpoint
-func generateEndpoint(scheme string, cluster string, app string, from int) {
-	if cluster == "prod" {
-		endpoint = fmt.Sprintf("%s://%v.swarm-gateways.net", scheme, from)
-	} else if cluster == "private-internal" {
-		endpoint = fmt.Sprintf("%s://swarm-private-internal-%v:8500", scheme, from)
-	} else {
-		endpoint = fmt.Sprintf("%s://%s-%v-%s.stg.swarm-gateways.net", scheme, app, from, cluster)
-	}
-}
-
-func cliUploadSpeed(c *cli.Context) error {
-	log.PrintOrigins(true)
-	log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(os.Stdout, log.TerminalFormat(true))))
-
-	metrics.GetOrRegisterCounter("upload-speed", nil).Inc(1)
-
-	errc := make(chan error)
-	go func() {
-		errc <- uploadSpeed(c)
-	}()
-
-	select {
-	case err := <-errc:
-		if err != nil {
-			metrics.GetOrRegisterCounter("upload-speed.fail", nil).Inc(1)
-		}
-		return err
-	case <-time.After(time.Duration(timeout) * time.Second):
-		metrics.GetOrRegisterCounter("upload-speed.timeout", nil).Inc(1)
-		return fmt.Errorf("timeout after %v sec", timeout)
-	}
-}
-
 func uploadSpeed(c *cli.Context) error {
 	defer func(now time.Time) {
 		totalTime := time.Since(now)
@@ -73,25 +37,22 @@ func uploadSpeed(c *cli.Context) error {
 		metrics.GetOrRegisterCounter("upload-speed.total-time", nil).Inc(int64(totalTime))
 	}(time.Now())
 
-	generateEndpoint(scheme, cluster, appName, from)
+	endpoint := generateEndpoint(scheme, cluster, appName, from)
 	seed := int(time.Now().UnixNano() / 1e6)
 	log.Info("uploading to "+endpoint, "seed", seed)
 
-	randomBytes := testutil.RandomBytes(seed, filesize*1000)
+	h := md5.New()
+	r := io.TeeReader(io.LimitReader(crand.Reader, int64(filesize*1000)), h)
 
 	t1 := time.Now()
-	hash, err := upload(&randomBytes, endpoint)
+	hash, err := upload(r, filesize*1000, endpoint)
 	if err != nil {
 		log.Error(err.Error())
 		return err
 	}
 	metrics.GetOrRegisterCounter("upload-speed.upload-time", nil).Inc(int64(time.Since(t1)))
 
-	fhash, err := digest(bytes.NewReader(randomBytes))
-	if err != nil {
-		log.Error(err.Error())
-		return err
-	}
+	fhash := h.Sum(nil)
 
 	log.Info("uploaded successfully", "hash", hash, "digest", fmt.Sprintf("%x", fhash))
 	return nil