From 2912f40f8eca2bb04c0d69f35e3d277a4391cd20 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 3 Apr 2018 12:42:49 +0200 Subject: [PATCH] [bench] switch from glide to dep --- tm-bench/Dockerfile.dev | 7 +- tm-bench/Gopkg.lock | 283 ++++++++++++++++++++++++++++++++++++++++ tm-bench/Gopkg.toml | 58 ++++++++ tm-bench/glide.lock | 134 ------------------- tm-bench/glide.yaml | 20 --- 5 files changed, 346 insertions(+), 156 deletions(-) create mode 100644 tm-bench/Gopkg.lock create mode 100644 tm-bench/Gopkg.toml delete mode 100644 tm-bench/glide.lock delete mode 100644 tm-bench/glide.yaml diff --git a/tm-bench/Dockerfile.dev b/tm-bench/Dockerfile.dev index 22c172133..03b6f9724 100644 --- a/tm-bench/Dockerfile.dev +++ b/tm-bench/Dockerfile.dev @@ -4,8 +4,11 @@ RUN mkdir -p /go/src/github.com/tendermint/tools/tm-bench WORKDIR /go/src/github.com/tendermint/tools/tm-bench COPY Makefile /go/src/github.com/tendermint/tools/tm-bench/ -COPY glide.yaml /go/src/github.com/tendermint/tools/tm-bench/ -COPY glide.lock /go/src/github.com/tendermint/tools/tm-bench/ + +RUN make get_tools + +COPY Gopkg.toml /go/src/github.com/tendermint/tools/tm-bench/ +COPY Gopkg.lock /go/src/github.com/tendermint/tools/tm-bench/ RUN make get_vendor_deps diff --git a/tm-bench/Gopkg.lock b/tm-bench/Gopkg.lock new file mode 100644 index 000000000..29ab8f55e --- /dev/null +++ b/tm-bench/Gopkg.lock @@ -0,0 +1,283 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + branch = "master" + name = "github.com/btcsuite/btcd" + packages = ["btcec"] + revision = "2be2f12b358dc57d70b8f501b00be450192efbc3" + +[[projects]] + branch = "master" + name = "github.com/ebuchman/fail-test" + packages = ["."] + revision = "95f809107225be108efcf10a3509e4ea6ceef3c4" + +[[projects]] + name = "github.com/go-kit/kit" + packages = [ + "log", + "log/level", + "log/term" + ] + revision = "4dc7be5d2d12881735283bcab7352178e190fc71" + version = "v0.6.0" + +[[projects]] + name = "github.com/go-logfmt/logfmt" + packages = ["."] + revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5" + version = "v0.3.0" + +[[projects]] + name = "github.com/go-stack/stack" + packages = ["."] + revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc" + version = "v1.7.0" + +[[projects]] + name = "github.com/gogo/protobuf" + packages = [ + "gogoproto", + "jsonpb", + "proto", + "protoc-gen-gogo/descriptor", + "sortkeys", + "types" + ] + revision = "1adfc126b41513cc696b209667c8656ea7aac67c" + version = "v1.0.0" + +[[projects]] + name = "github.com/golang/protobuf" + packages = [ + "proto", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/timestamp" + ] + revision = "925541529c1fa6821df4e44ce2723319eb2be768" + version = "v1.0.0" + +[[projects]] + branch = "master" + name = "github.com/golang/snappy" + packages = ["."] + revision = "553a641470496b2327abcac10b36396bd98e45c9" + +[[projects]] + name = "github.com/gorilla/websocket" + packages = ["."] + revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b" + version = "v1.2.0" + +[[projects]] + branch = "master" + name = "github.com/jmhodges/levigo" + packages = ["."] + revision = "c42d9e0ca023e2198120196f842701bb4c55d7b9" + +[[projects]] + branch = "master" + name = "github.com/kr/logfmt" + packages = ["."] + revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0" + +[[projects]] + name = "github.com/pkg/errors" + packages = ["."] + revision = "645ef00459ed84a119197bfb8d8205042c6df63d" + version = "v0.8.0" + +[[projects]] + branch = "master" + name = "github.com/rcrowley/go-metrics" + packages = ["."] + revision = "8732c616f52954686704c8645fe1a9d59e9df7c1" + +[[projects]] + branch = "master" + name = "github.com/syndtr/goleveldb" + packages = [ + "leveldb", + "leveldb/cache", + "leveldb/comparer", + "leveldb/errors", + "leveldb/filter", + "leveldb/iterator", + "leveldb/journal", + "leveldb/memdb", + "leveldb/opt", + "leveldb/storage", + "leveldb/table", + "leveldb/util" + ] + revision = "714f901b98fdb3aa954b4193d8cbd64a28d80cad" + +[[projects]] + name = "github.com/tendermint/abci" + packages = [ + "client", + "example/code", + "example/kvstore", + "types" + ] + revision = "46686763ba8ea595ede16530ed4a40fb38f49f94" + version = "v0.10.2" + +[[projects]] + branch = "master" + name = "github.com/tendermint/ed25519" + packages = [ + ".", + "edwards25519", + "extra25519" + ] + revision = "d8387025d2b9d158cf4efb07e7ebf814bcce2057" + +[[projects]] + name = "github.com/tendermint/go-crypto" + packages = ["."] + revision = "c3e19f3ea26f5c3357e0bcbb799b0761ef923755" + version = "v0.5.0" + +[[projects]] + name = "github.com/tendermint/go-wire" + packages = [ + ".", + "data" + ] + revision = "fa721242b042ecd4c6ed1a934ee740db4f74e45c" + source = "github.com/tendermint/go-amino" + version = "v0.7.3" + +[[projects]] + name = "github.com/tendermint/tendermint" + packages = [ + "config", + "consensus/types", + "p2p", + "p2p/conn", + "p2p/upnp", + "proxy", + "rpc/core/types", + "rpc/lib/client", + "rpc/lib/types", + "state", + "types", + "wire" + ] + revision = "6f9956990c444d53f62f2a3905ed410cfe9afe77" + version = "v0.17.1" + +[[projects]] + branch = "master" + name = "github.com/tendermint/tmlibs" + packages = [ + "common", + "db", + "events", + "flowrate", + "log", + "merkle", + "pubsub", + "pubsub/query" + ] + revision = "24da7009c3d8c019b40ba4287495749e3160caca" + +[[projects]] + branch = "master" + name = "github.com/tendermint/tools" + packages = [ + "tm-monitor/eventmeter", + "tm-monitor/monitor" + ] + revision = "62965e68f13de80f196bea194ed4a3dbfcf4048b" + +[[projects]] + branch = "master" + name = "golang.org/x/crypto" + packages = [ + "curve25519", + "nacl/box", + "nacl/secretbox", + "openpgp/armor", + "openpgp/errors", + "poly1305", + "ripemd160", + "salsa20/salsa" + ] + revision = "12892e8c234f4fe6f6803f052061de9057903bb2" + +[[projects]] + branch = "master" + name = "golang.org/x/net" + packages = [ + "context", + "http2", + "http2/hpack", + "idna", + "internal/timeseries", + "lex/httplex", + "trace" + ] + revision = "b68f30494add4df6bd8ef5e82803f308e7f7c59c" + +[[projects]] + name = "golang.org/x/text" + packages = [ + "collate", + "collate/build", + "internal/colltab", + "internal/gen", + "internal/tag", + "internal/triegen", + "internal/ucd", + "language", + "secure/bidirule", + "transform", + "unicode/bidi", + "unicode/cldr", + "unicode/norm", + "unicode/rangetable" + ] + revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" + version = "v0.3.0" + +[[projects]] + branch = "master" + name = "google.golang.org/genproto" + packages = ["googleapis/rpc/status"] + revision = "ab0870e398d5dd054b868c0db1481ab029b9a9f2" + +[[projects]] + name = "google.golang.org/grpc" + packages = [ + ".", + "balancer", + "codes", + "connectivity", + "credentials", + "grpclb/grpc_lb_v1/messages", + "grpclog", + "internal", + "keepalive", + "metadata", + "naming", + "peer", + "resolver", + "stats", + "status", + "tap", + "transport" + ] + revision = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e" + version = "v1.7.5" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "9e81caf774c988dc43578eac01f7b783d5179226a14e60b31db5d50a29cf633f" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/tm-bench/Gopkg.toml b/tm-bench/Gopkg.toml new file mode 100644 index 000000000..17ea95d38 --- /dev/null +++ b/tm-bench/Gopkg.toml @@ -0,0 +1,58 @@ +# Gopkg.toml example +# +# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true + + +[[constraint]] + name = "github.com/go-kit/kit" + version = "^0.6.0" + +[[constraint]] + name = "github.com/gorilla/websocket" + version = "1.2.0" + +[[constraint]] + name = "github.com/pkg/errors" + version = "0.8.0" + +[[constraint]] + branch = "master" + name = "github.com/rcrowley/go-metrics" + +[[constraint]] + name = "github.com/tendermint/tendermint" + version = "0.17.1" + +[[constraint]] + name = "github.com/tendermint/tmlibs" + version = "0.7.1" + +[[constraint]] + name = "github.com/tendermint/tools" + branch = "master" + +[prune] + go-tests = true + unused-packages = true diff --git a/tm-bench/glide.lock b/tm-bench/glide.lock deleted file mode 100644 index 198911eed..000000000 --- a/tm-bench/glide.lock +++ /dev/null @@ -1,134 +0,0 @@ -hash: 46f5e4380fdca1f3c0211f1f54f2c0dcd2213aabbb96cdaaaa201a55156bfb97 -updated: 2017-12-07T17:26:11.121786018Z -imports: -- name: github.com/btcsuite/btcd - version: 2e60448ffcc6bf78332d1fe590260095f554dd78 - subpackages: - - btcec -- name: github.com/go-kit/kit - version: ebf82f4a7270657af57182f212579e5ec8c9fac8 - subpackages: - - log - - log/level - - log/term -- name: github.com/go-logfmt/logfmt - version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 -- name: github.com/go-playground/locales - version: e4cbcb5d0652150d40ad0646651076b6bd2be4f6 - subpackages: - - currency -- name: github.com/go-playground/universal-translator - version: 71201497bace774495daed26a3874fd339e0b538 -- name: github.com/go-stack/stack - version: 259ab82a6cad3992b4e21ff5cac294ccb06474bc -- name: github.com/golang/protobuf - version: 1e59b77b52bf8e4b449a57e6f79f21226d571845 - subpackages: - - proto - - ptypes - - ptypes/any - - ptypes/duration - - ptypes/timestamp -- name: github.com/gorilla/websocket - version: ea4d1f681babbce9545c9c5f3d5194a789c89f5b -- name: github.com/kr/logfmt - version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 -- name: github.com/pkg/errors - version: 645ef00459ed84a119197bfb8d8205042c6df63d -- name: github.com/rcrowley/go-metrics - version: e181e095bae94582363434144c61a9653aff6e50 -- name: github.com/tendermint/abci - version: 76ef8a0697c6179220a74c479b36c27a5b53008a - subpackages: - - client - - example/dummy - - types -- name: github.com/tendermint/ed25519 - version: d8387025d2b9d158cf4efb07e7ebf814bcce2057 - subpackages: - - edwards25519 - - extra25519 -- name: github.com/tendermint/go-crypto - version: dd20358a264c772b4a83e477b0cfce4c88a7001d -- name: github.com/tendermint/go-wire - version: b6fc872b42d41158a60307db4da051dd6f179415 - subpackages: - - data -- name: github.com/tendermint/tendermint - version: c7f923c5b0d0f0f26566281aa251259d1bef3a6c - subpackages: - - config - - consensus/types - - p2p - - p2p/upnp - - rpc/core/types - - rpc/lib/client - - rpc/lib/types - - types -- name: github.com/tendermint/tmlibs - version: b854baa1fce7101c90b1d301b3359bb412f981c0 - subpackages: - - common - - events - - flowrate - - log - - merkle -- name: github.com/tendermint/tools - version: c36867e971f4d717e7ceb2c3d451a64e9a101b99 - subpackages: - - tm-monitor/eventmeter - - tm-monitor/monitor -- name: golang.org/x/crypto - version: 94eea52f7b742c7cbe0b03b22f0c4c8631ece122 - subpackages: - - curve25519 - - nacl/box - - nacl/secretbox - - openpgp/armor - - openpgp/errors - - poly1305 - - ripemd160 - - salsa20/salsa -- name: golang.org/x/net - version: faacc1b5e36e3ff02cbec9661c69ac63dd5a83ad - subpackages: - - context - - http2 - - http2/hpack - - idna - - internal/timeseries - - lex/httplex - - trace -- name: golang.org/x/text - version: be25de41fadfae372d6470bda81ca6beb55ef551 - subpackages: - - secure/bidirule - - transform - - unicode/bidi - - unicode/norm -- name: google.golang.org/genproto - version: 7f0da29060c682909f650ad8ed4e515bd74fa12a - subpackages: - - googleapis/rpc/status -- name: google.golang.org/grpc - version: f7bf885db0b7479a537ec317c6e48ce53145f3db - subpackages: - - balancer - - codes - - connectivity - - credentials - - grpclb/grpc_lb_v1/messages - - grpclog - - internal - - keepalive - - metadata - - naming - - peer - - resolver - - stats - - status - - tap - - transport -- name: gopkg.in/go-playground/validator.v9 - version: 61caf9d3038e1af346dbf5c2e16f6678e1548364 -testImports: [] diff --git a/tm-bench/glide.yaml b/tm-bench/glide.yaml deleted file mode 100644 index 8b2228f82..000000000 --- a/tm-bench/glide.yaml +++ /dev/null @@ -1,20 +0,0 @@ -package: github.com/tendermint/tools/tm-bench -import: -- package: github.com/go-kit/kit - subpackages: - - log/term -- package: github.com/gorilla/websocket -- package: github.com/pkg/errors -- package: github.com/rcrowley/go-metrics -- package: github.com/tendermint/tendermint - version: v0.12.1 - subpackages: - - rpc/lib/types - - types -- package: github.com/tendermint/tmlibs - subpackages: - - log -- package: github.com/tendermint/tools - version: c36867e971f4d717e7ceb2c3d451a64e9a101b99 - subpackages: - - tm-monitor/monitor