update make file due to we are using vendor to control all the packages

diff --git a/Makefile b/Makefile
index f09ca6f..96b0c6e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
-GOTOOLS  = \
-                  github.com/mitchellh/gox \
-                  github.com/Masterminds/glide
+GOTOOLS  = github.com/mitchellh/gox
 PACKAGES = $(shell go list ./... | grep -v '/vendor/' | grep -v '/rpc/')
 
-all: install test
+all: test
 
 bytomd:
        @echo "Building bytomd to cmd/bytomd/bytomd"
@@ -15,14 +13,6 @@ bytomcli:
        @go build -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`" \
     -o cmd/bytomcli/bytomcli cmd/bytomcli/main.go
 
-install: get_vendor_deps
-       @echo "====> Done!"
-
-get_vendor_deps: ensure_tools
-       @rm -rf vendor/
-       @echo "====> Running glide install"
-       @glide install
-
 ensure_tools:
        go get $(GOTOOLS)
 
@@ -30,4 +20,4 @@ test:
        @echo "====> Running go test"
        @go test $(PACKAGES)
 
-.PHONY: install get_vendor_deps ensure_tools test
+.PHONY: ensure_tools test

diff --git a/glide.lock b/glide.lock
deleted file mode 100644 (file)
index c2a6730..0000000
--- a/glide.lock
+++ /dev/null
@@ -1,235 +0,0 @@
-hash: 4f15d2d062129c7ddc5d485e2180c9fad7d56e4006e1d3ff0fb1601711ca3f6d
-updated: 2017-10-28T10:18:01.957773712+08:00
-imports:
-- name: github.com/btcsuite/btcd
-  version: 53f55a46349aa8f44b90895047e843666991cf24
-  subpackages:
-  - btcec
-- name: github.com/codahale/hdrhistogram
-  version: 3a0bb77429bd3a61596f5e8a3172445844342120
-- name: github.com/ebuchman/fail-test
-  version: 95f809107225be108efcf10a3509e4ea6ceef3c4
-- name: github.com/fsnotify/fsnotify
-  version: 4da3e2cfbabc9f751898f250b49f2439785783a1
-- name: github.com/go-kit/kit
-  version: 6964666de57c88f7d93da127e900d201b632f561
-  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: 7a2f19628aabfe68f0766b59e74d6315f8347d22
-- name: github.com/gogo/protobuf
-  version: 9df9efe4c742f1a2bfdedf1c3b6902fc6e814c6b
-  subpackages:
-  - proto
-- name: github.com/golang/crypto
-  version: 2509b142fb2b797aa7587dad548f113b2c0f20ce
-  subpackages:
-  - nacl/box
-  - nacl/secretbox
-  - ripemd160
-- name: github.com/golang/groupcache
-  version: b710c8433bd175204919eb38776e944233235d03
-  subpackages:
-  - lru
-  - singleflight
-- name: github.com/golang/net
-  version: c73622c77280266305273cb545f54516ced95b93
-  subpackages:
-  - context
-- name: github.com/golang/protobuf
-  version: fec3b39b059c0f88fa6b20f5ed012b1aa203a8b4
-  subpackages:
-  - proto
-  - ptypes/any
-- name: github.com/golang/snappy
-  version: 553a641470496b2327abcac10b36396bd98e45c9
-- name: github.com/gorilla/websocket
-  version: a91eba7f97777409bc2c443f5534d41dd20c5720
-- name: github.com/hashicorp/hcl
-  version: 392dba7d905ed5d04a5794ba89f558b27e2ba1ca
-  subpackages:
-  - hcl/ast
-  - hcl/parser
-  - hcl/scanner
-  - hcl/strconv
-  - hcl/token
-  - json/parser
-  - json/scanner
-  - json/token
-- name: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-- name: github.com/jmhodges/levigo
-  version: c42d9e0ca023e2198120196f842701bb4c55d7b9
-- name: github.com/kr/logfmt
-  version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
-- name: github.com/kr/secureheader
-  version: a4295c4b19606af8e3366057e129204fb8b77411
-- name: github.com/magiconair/properties
-  version: 51463bfca2576e06c62a8504b5c0f06d61312647
-- name: github.com/mitchellh/mapstructure
-  version: cc8532a8e9a55ea36402aa21efdf403a60d34096
-- name: github.com/pborman/uuid
-  version: e790cca94e6cc75c7064b1332e63811d4aae1a53
-- name: github.com/pelletier/go-buffruneio
-  version: c37440a7cf42ac63b919c752ca73a85067e05992
-- name: github.com/pelletier/go-toml
-  version: 5c26a6ff6fd178719e15decac1c8196da0d7d6d1
-- name: github.com/pkg/errors
-  version: c605e284fe17294bda444b34710735b29d1a9d90
-- name: github.com/rjeczalik/notify
-  version: 767eb674ef14b09119b2fff3601e64558d530c47
-- name: github.com/sirupsen/logrus
-  version: 89742aefa4b206dcf400792f3bd35b542998eb3b
-- name: github.com/spf13/afero
-  version: 9be650865eab0c12963d8753212f4f9c66cdcf12
-  subpackages:
-  - mem
-- name: github.com/spf13/cast
-  version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4
-- name: github.com/spf13/cobra
-  version: 4cdb38c072b86bf795d2c81de50784d9fdd6eb77
-- name: github.com/spf13/jwalterweatherman
-  version: 8f07c835e5cc1450c082fe3a439cf87b0cbb2d99
-- name: github.com/spf13/pflag
-  version: e57e3eeb33f795204c1ca35f56c44f83227c6e66
-- name: github.com/spf13/viper
-  version: 0967fc9aceab2ce9da34061253ac10fb99bba5b2
-- name: github.com/stretchr/testify
-  version: 4d4bfba8f1d1027c4fdbe371823030df51419987
-  subpackages:
-  - assert
-  - require
-- name: github.com/syndtr/goleveldb
-  version: 8c81ea47d4c41a385645e133e15510fc6a2a74b4
-  subpackages:
-  - leveldb
-  - leveldb/cache
-  - leveldb/comparer
-  - leveldb/errors
-  - leveldb/filter
-  - leveldb/iterator
-  - leveldb/journal
-  - leveldb/memdb
-  - leveldb/opt
-  - leveldb/storage
-  - leveldb/table
-  - leveldb/util
-- name: github.com/tendermint/abci
-  version: 864d1f80b36b440bde030a5c18d8ac3aa8c2949d
-  subpackages:
-  - client
-  - example/dummy
-  - types
-- name: github.com/tendermint/ed25519
-  version: 1f52c6f8b8a5c7908aff4497c186af344b428925
-  subpackages:
-  - edwards25519
-  - extra25519
-- name: github.com/tendermint/go-crypto
-  version: 7dff40942a64cdeefefa9446b2d104750b349f8a
-- name: github.com/tendermint/go-wire
-  version: 5f88da3dbc1a72844e6dfaf274ce87f851d488eb
-  subpackages:
-  - data
-  - data/base58
-- name: github.com/tendermint/tmlibs
-  version: d9525c0fb671204450b160807480e1263053fb20
-  subpackages:
-  - autofile
-  - cli
-  - clist
-  - common
-  - db
-  - events
-  - flowrate
-  - log
-  - merkle
-- name: golang.org/x/crypto
-  version: 84f24dfdf3c414ed893ca1b318d0045ef5a1f607
-  subpackages:
-  - curve25519
-  - nacl/box
-  - nacl/secretbox
-  - openpgp/armor
-  - openpgp/errors
-  - pbkdf2
-  - poly1305
-  - ripemd160
-  - salsa20/salsa
-  - scrypt
-  - sha3
-  - ssh/terminal
-- name: golang.org/x/net
-  version: 8663ed5da4fd087c3cfb99a996e628b72e2f0948
-  subpackages:
-  - context
-  - http2
-  - http2/hpack
-  - idna
-  - internal/timeseries
-  - lex/httplex
-  - trace
-- name: golang.org/x/sys
-  version: e62c3de784db939836898e5c19ffd41bece347da
-  subpackages:
-  - unix
-- name: golang.org/x/text
-  version: 6353ef0f924300eea566d3438817aa4d3374817e
-  subpackages:
-  - secure/bidirule
-  - transform
-  - unicode/bidi
-  - unicode/norm
-- name: golang.org/x/time
-  version: 6dc17368e09b0e8634d71cac8168d853e869a0c7
-  subpackages:
-  - rate
-- name: google.golang.org/genproto
-  version: bb3573be0c484136831138976d444b8754777aff
-  subpackages:
-  - googleapis/rpc/status
-- name: google.golang.org/grpc
-  version: 11d93ecdb918872ee841ba3a2dc391aa6d4f57c3
-  subpackages:
-  - codes
-  - credentials
-  - grpclb/grpc_lb_v1
-  - grpclog
-  - internal
-  - keepalive
-  - metadata
-  - naming
-  - peer
-  - stats
-  - status
-  - tap
-  - transport
-- name: gopkg.in/go-playground/validator.v9
-  version: 1304298bf10d085adec514b076772a79c9cadb6b
-- name: gopkg.in/yaml.v2
-  version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
-testImports:
-- name: github.com/davecgh/go-spew
-  version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
-  subpackages:
-  - spew
-- name: github.com/pmezard/go-difflib
-  version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
-  subpackages:
-  - difflib
-- name: github.com/tendermint/merkleeyes
-  version: 2f6e5d31e7a35045d8d0a5895cb1fec33dd4d32b
-  subpackages:
-  - app
-  - iavl
-  - testutil

diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644 (file)
index f8d175e..0000000
--- a/glide.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-package: github.com/bytom
-import:
-- package: github.com/ebuchman/fail-test
-- package: github.com/gogo/protobuf
-  subpackages:
-  - proto
-- package: github.com/golang/protobuf
-  subpackages:
-  - proto
-- package: github.com/gorilla/websocket
-- package: github.com/pkg/errors
-- package: github.com/spf13/cobra
-- package: github.com/spf13/viper
-- package: github.com/stretchr/testify
-  subpackages:
-  - require
-- package: github.com/tendermint/abci
-  version: v0.5.0
-  subpackages:
-  - client
-  - example/dummy
-  - types
-- package: github.com/tendermint/go-crypto
-  version: v0.2.0
-- package: github.com/tendermint/go-wire
-  version: v0.6.2
-  subpackages:
-  - data
-- package: github.com/tendermint/tmlibs
-  version: v0.4.0
-  subpackages:
-  - autofile
-  - cli
-  - clist
-  - common
-  - db
-  - events
-  - flowrate
-  - log
-  - merkle
-- package: github.com/golang/crypto
-  subpackages:
-  - nacl/box
-  - nacl/secretbox
-  - ripemd160
-- package: github.com/golang/net
-  subpackages:
-  - context
-- package: google.golang.org/grpc
-testImport:
-- package: github.com/tendermint/merkleeyes
-  version: develop
-  subpackages:
-  - app
-  - iavl
-  - testutil