Browse Source

fix flowrate dep and test

pull/333/head
Ethan Buchman 8 years ago
parent
commit
8390e88e27
5 changed files with 15 additions and 10 deletions
  1. +1
    -1
      blockchain/pool.go
  2. +3
    -3
      glide.lock
  3. +3
    -1
      glide.yaml
  4. +4
    -3
      scripts/glide/parse.sh
  5. +4
    -2
      test/test_libs.sh

+ 1
- 1
blockchain/pool.go View File

@ -5,8 +5,8 @@ import (
"sync"
"time"
flow "github.com/tendermint/flowcontrol"
. "github.com/tendermint/go-common"
flow "github.com/tendermint/go-flowrate/flowrate"
"github.com/tendermint/tendermint/types"
)


+ 3
- 3
glide.lock View File

@ -49,8 +49,8 @@ imports:
subpackages:
- edwards25519
- extra25519
- name: github.com/tendermint/flowcontrol
version: 84d9671090430e8ec80e35b339907e0579b999eb
- name: github.com/tendermint/go-flowrate
version: a20c98e61957faa93b4014fbd902f20ab9317a6a
- name: github.com/tendermint/go-clist
version: 3baa390bbaf7634251c42ad69a8682e7e3990552
- name: github.com/tendermint/go-common
@ -70,7 +70,7 @@ imports:
- name: github.com/tendermint/go-merkle
version: 05042c6ab9cad51d12e4cecf717ae68e3b1409a8
- name: github.com/tendermint/go-p2p
version: 2cee3646927182964268e63c4248db3def69ac4e
version: eab2baa363de01b052b88c559e803776cd2c7dd6
subpackages:
- upnp
- name: github.com/tendermint/go-rpc


+ 3
- 1
glide.yaml View File

@ -6,7 +6,6 @@ import:
- package: github.com/gorilla/websocket
- package: github.com/spf13/pflag
- package: github.com/tendermint/ed25519
- package: github.com/tendermint/flowcontrol
- package: github.com/tendermint/go-clist
- package: github.com/tendermint/go-common
- package: github.com/tendermint/go-config
@ -34,3 +33,6 @@ import:
- package: golang.org/x/crypto
subpackages:
- ripemd160
- package: github.com/tendermint/go-flowrate
subpackages:
- flowrate

+ 4
- 3
scripts/glide/parse.sh View File

@ -1,10 +1,11 @@
#! /bin/bash
set -euo pipefail
LIB=$1
if [[ "$GLIDE" == "" ]]; then
GLIDE=$GOPATH/src/github.com/tendermint/tendermint/glide.lock
fi
set -euo pipefail
LIB=$1
cat $GLIDE | grep -A1 $LIB | grep -v $LIB | awk '{print $2}'

+ 4
- 2
test/test_libs.sh View File

@ -1,4 +1,5 @@
#! /bin/bash
set -e
# set glide.lock path
if [[ "$GLIDE" == "" ]]; then
@ -28,10 +29,11 @@ for lib in "${LIBS_GO_TEST[@]}"; do
done
for lib in "${LIBS_MAKE_TEST[@]}"; do
getDep $lib
# checkout vendored version of lib
bash scripts/glide/checkout.sh $GLIDE $lib
echo "Testing $lib ..."
cd $GOPATH/src/github.com/tendermint/$lib
make test
if [[ "$?" != 0 ]]; then
echo "FAIL"


Loading…
Cancel
Save