Skip to content

Commit

Permalink
Merge pull request #1 from erigontech/upd
Browse files Browse the repository at this point in the history
upd
  • Loading branch information
dvovk authored Jul 17, 2024
2 parents c9140c7 + ce4b6de commit b35feea
Show file tree
Hide file tree
Showing 11 changed files with 59 additions and 9 deletions.
Binary file modified .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# speedtest
Fork of https://github.com/showwin/speedtest-go adjusted to use erigon infra to do download speed test
Fork of https://github.com/erigontech/speedtest adjusted to use erigon infra to do download speed test

Binary file added example/.DS_Store
Binary file not shown.
48 changes: 48 additions & 0 deletions example/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package main

import (
"fmt"
"log"
"net/http"

"github.com/erigontech/speedtest/speedtest"
)

var cloudflareHeaders = http.Header{
"lsjdjwcush6jbnjj3jnjscoscisoc5s": []string{"I%OSJDNFKE783DDHHJD873EFSIVNI7384R78SSJBJBCCJBC32JABBJCBJK45"},
}

func main() {
servurl := []string{
"v1:https://caplin-snapshots-sepolia.erigon.network",
"v1:https://erigon2-v1-snapshots-sepolia.erigon.network/",
"v1:https://erigon2-v2-snapshots-sepolia.erigon.network/",
"v1:https://erigon2-v3-snapshots-sepolia.erigon.network/",
"v1:https://erigon3-v1-snapshots-sepolia.erigon.network/",
"v1:https://erigon3-v3-snapshots-sepolia.erigon.network/",
"v1:https://erigon3-v3-snapshots-sepolia.erigon.network/v2/",
}

urlstr, err := speedtest.SelectSegmentFromWebseeds(servurl, cloudflareHeaders)
if err != nil {
log.Fatal(err)
}

s, err := speedtest.CustomServer(urlstr)
if err != nil {
log.Fatal(err)
}

checkError(s.PingTest(nil))
checkError(s.DownloadTest())

// Note: The unit of s.DLSpeed, s.ULSpeed is bytes per second, this is a float64.
fmt.Printf("Latency: %s, Download: %s\n", s.Latency, s.DLSpeed)
s.Context.Reset()
}

func checkError(err error) {
if err != nil {
log.Fatal(err)
}
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/showwin/speedtest-go
module github.com/erigontech/speedtest

go 1.19

Expand Down
4 changes: 2 additions & 2 deletions speedtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"sync/atomic"
"time"

"github.com/showwin/speedtest-go/speedtest/transport"
"github.com/erigontech/speedtest/speedtest/transport"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/showwin/speedtest-go/speedtest"
"github.com/erigontech/speedtest/speedtest"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion speedtest/data_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import (
"bytes"
"context"
"errors"
"github.com/showwin/speedtest-go/speedtest/internal"
"io"
"math"
"runtime"
"sync"
"sync/atomic"
"time"

"github.com/erigontech/speedtest/speedtest/internal"
)

type Manager interface {
Expand Down
2 changes: 1 addition & 1 deletion speedtest/internal/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Issue #192

<img width="1172" alt="SpeedTest-Go (1)" src="https://github.com/showwin/speedtest-go/assets/30739857/ecced0e9-830c-42d6-aa8b-e3dcf8d124d6">
<img width="1172" alt="SpeedTest-Go (1)" src="https://github.com/erigontech/speedtest/assets/30739857/ecced0e9-830c-42d6-aa8b-e3dcf8d124d6">

1. Use welford alg to quickly calculate standard deviation and mean.
2. The welford alg integrated moving window feature, This allows us to ignore early data with excessive volatility.
Expand Down
3 changes: 2 additions & 1 deletion speedtest/loss.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package speedtest

import (
"context"
"github.com/showwin/speedtest-go/speedtest/transport"
"net"
"sync"
"time"

"github.com/erigontech/speedtest/speedtest/transport"
)

type PacketLossAnalyzerOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion speedtest/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"sync/atomic"
"time"

"github.com/showwin/speedtest-go/speedtest/transport"
"github.com/erigontech/speedtest/speedtest/transport"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion speedtest/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"sync"
"time"

"github.com/showwin/speedtest-go/speedtest/transport"
"github.com/erigontech/speedtest/speedtest/transport"
)

const (
Expand Down

0 comments on commit b35feea

Please sign in to comment.