mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-19 06:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for tools repo merge (#1945)

Browse Source 
fixes for tools repo merge (#1943)
This commit is contained in:
Zach
2018-07-10 16:42:27 -04:00
committed by GitHub
parent 44dad6d70b
commit 8ce588d984
19 changed files with 186 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/tm-bench/Dockerfile.dev
+4 -4
View File
@@ -1,12 +1,12 @@
FROM golang:latest
RUN mkdir -p /go/src/github.com/tendermint/tools/tm-bench
WORKDIR /go/src/github.com/tendermint/tools/tm-bench
RUN mkdir -p /go/src/github.com/tendermint/tendermint/tools/tm-bench
WORKDIR /go/src/github.com/tendermint/tendermint/tools/tm-bench
COPY Makefile /go/src/github.com/tendermint/tools/tm-bench/
COPY Makefile /go/src/github.com/tendermint/tendermint/tools/tm-bench/
RUN make get_tools
COPY . /go/src/github.com/tendermint/tools/tm-bench
COPY . /go/src/github.com/tendermint/tendermint/tools/tm-bench
RUN make get_vendor_deps
tools/tm-bench/Gopkg.lock
Generated
+28 -30
View File
@@ -11,7 +11,7 @@
branch = "master"
name = "github.com/btcsuite/btcd"
packages = ["btcec"]
revision = "675abc5df3c5531bc741b56a765e35623459da6d"
revision = "fdfc19097e7ac6b57035062056f5b7b4638b8898"
[[projects]]
name = "github.com/davecgh/go-spew"
@@ -80,7 +80,7 @@
branch = "master"
name = "github.com/golang/snappy"
packages = ["."]
revision = "553a641470496b2327abcac10b36396bd98e45c9"
revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"
[[projects]]
name = "github.com/gorilla/websocket"
@@ -113,13 +113,13 @@
version = "v0.8.0"
[[projects]]
branch = "master"
name = "github.com/prometheus/client_golang"
packages = [
"prometheus",
"prometheus/promhttp"
]
revision = "c5b7fccd204277076155f10851dad72b76a49317"
version = "v0.8.0"
revision = "ae27198cdd90bf12cd134ad79d1366a6cf49f632"
[[projects]]
branch = "master"
@@ -146,7 +146,7 @@
"nfs",
"xfs"
]
revision = "7d6f385de8bea29190f15ba9931442a0eaef9af7"
revision = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"
[[projects]]
branch = "master"
@@ -171,7 +171,7 @@
"leveldb/table",
"leveldb/util"
]
revision = "ae970a0732be3a1f5311da86118d37b9f4bd2a5a"
revision = "c4c61651e9e37fa117f53c5a906d3b63090d8445"
[[projects]]
branch = "master"
@@ -190,6 +190,7 @@
version = "0.10.1"
[[projects]]
branch = "develop"
name = "github.com/tendermint/tendermint"
packages = [
"abci/client",
@@ -201,9 +202,16 @@
"consensus",
"consensus/types",
"crypto",
"crypto/merkle",
"crypto/tmhash",
"evidence",
"libs/autofile",
"libs/clist",
"libs/common",
"libs/db",
"libs/events",
"libs/flowrate",
"libs/log",
"libs/pubsub",
"libs/pubsub/query",
"mempool",
@@ -229,29 +237,14 @@
"types",
"version"
]
revision = "aa20c45ae99bb57a8efa2be7b09898e8967d1965"
version = "v0.21.1-rc1"
[[projects]]
branch = "develop"
name = "github.com/tendermint/tmlibs"
packages = [
"autofile",
"clist",
"common",
"db",
"flowrate",
"log",
"merkle",
"merkle/tmhash"
]
revision = "56f44670ebd5a4e99e55f3f7d6f4d360ef5f1973"
revision = "9d81a74429e093f3167875e0145ad957874c77d1"
[[projects]]
branch = "master"
name = "golang.org/x/crypto"
packages = [
"curve25519",
"internal/subtle",
"nacl/box",
"nacl/secretbox",
"openpgp/armor",
@@ -260,7 +253,7 @@
"ripemd160",
"salsa20/salsa"
]
revision = "1f94bef427e370e425e55b172f3b5e300ef38304"
revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"
[[projects]]
branch = "master"
@@ -272,11 +265,10 @@
"http2/hpack",
"idna",
"internal/timeseries",
"lex/httplex",
"netutil",
"trace"
]
revision = "640f4622ab692b87c2f3a94265e6f579fe38263d"
revision = "292b43bbf7cb8d35ddf40f8d5100ef3837cced3f"
[[projects]]
name = "golang.org/x/text"
@@ -303,16 +295,20 @@
branch = "master"
name = "google.golang.org/genproto"
packages = ["googleapis/rpc/status"]
revision = "86e600f69ee4704c6efbf6a2a40a5c10700e76c2"
revision = "e92b116572682a5b432ddd840aeaba2a559eeff1"
[[projects]]
name = "google.golang.org/grpc"
packages = [
".",
"balancer",
"balancer/base",
"balancer/roundrobin",
"codes",
"connectivity",
"credentials",
"encoding",
"encoding/proto",
"grpclb/grpc_lb_v1/messages",
"grpclog",
"internal",
@@ -321,17 +317,19 @@
"naming",
"peer",
"resolver",
"resolver/dns",
"resolver/passthrough",
"stats",
"status",
"tap",
"transport"
]
revision = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e"
version = "v1.7.5"
revision = "d11072e7ca9811b1100b80ca0269ac831f06d024"
version = "v1.11.3"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "65c380641dcebca21a6343c9ea36bab5cbebff696e27c74d0735077f63272248"
inputs-digest = "bc54a74ffdfc09872726fcf5c72b5df882269dc1cd949ac3fbeac9a554fc25c6"
solver-name = "gps-cdcl"
solver-version = 1
tools/tm-bench/Gopkg.toml
-4
View File
@@ -45,10 +45,6 @@
name = "github.com/tendermint/tendermint"
branch = "develop"
[[constraint]]
name = "github.com/tendermint/tmlibs"
branch = "develop"
[prune]
go-tests = true
unused-packages = true
tools/tm-bench/main.go
+26 -31
View File
@@ -12,13 +12,11 @@ import (
"github.com/go-kit/kit/log/term"
metrics "github.com/rcrowley/go-metrics"
"github.com/tendermint/tendermint/libs/log"
tmrpc "github.com/tendermint/tendermint/rpc/client"
"github.com/tendermint/tmlibs/log"
)
var version = "0.3.0"
var logger = log.NewNopLogger()
type statistics struct {
@@ -106,35 +104,32 @@ Examples:
"broadcast_tx_"+broadcastTxMethod,
)
endTime := time.Duration(duration) * time.Second
select {
case <-time.After(endTime):
for i, t := range transacters {
t.Stop()
numCrashes := countCrashes(t.connsBroken)
if numCrashes != 0 {
fmt.Printf("%d connections crashed on transacter #%d\n", numCrashes, i)
}
<-time.After(endTime)
for i, t := range transacters {
t.Stop()
numCrashes := countCrashes(t.connsBroken)
if numCrashes != 0 {
fmt.Printf("%d connections crashed on transacter #%d\n", numCrashes, i)
}
timeStop := time.Now()
logger.Info("Time stopped", "t", timeStop)
stats, err := calculateStatistics(
client,
initialHeight,
timeStart,
timeStop,
duration,
)
if err != nil {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
printStatistics(stats, outputFormat)
return
}
timeStop := time.Now()
logger.Info("Time stopped", "t", timeStop)
stats, err := calculateStatistics(
client,
initialHeight,
timeStart,
timeStop,
duration,
)
if err != nil {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
printStatistics(stats, outputFormat)
}
func latestBlockHeight(client tmrpc.Client) int64 {
tools/tm-bench/transacter.go
+4 -4
View File
@@ -16,14 +16,14 @@ import (
"github.com/gorilla/websocket"
"github.com/pkg/errors"
rpctypes "github.com/tendermint/tendermint/rpc/lib/types"
"github.com/tendermint/tmlibs/log"
"github.com/tendermint/tendermint/libs/log"
rpctypes "github.com/tendermint/tendermint/rpc/lib/types"
)
const (
sendTimeout = 10 * time.Second
// see https://github.com/tendermint/go-rpc/blob/develop/server/handlers.go#L313
// see https://github.com/tendermint/tendermint/blob/master/rpc/lib/server/handlers.go
pingPeriod = (30 * 9 / 10) * time.Second
)
@@ -194,7 +194,7 @@ func (t *transacter) sendLoop(connIndex int) {
txNumber++
}
timeToSend := time.Now().Sub(startTime)
timeToSend := time.Since(startTime)
logger.Info(fmt.Sprintf("sent %d transactions", numTxSent), "took", timeToSend)
if timeToSend < 1*time.Second {
sleepTime := time.Second - timeToSend