Run make localnet-start on every commit and ensure network reaches at…

… least 10 blocks
cosmos · Aug 16, 2018 · 869a7ed · 869a7ed
1 parent 422dfa3
commit 869a7ed
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -150,6 +150,29 @@ jobs:
           name: upload
           command: bash <(curl -s https://codecov.io/bash) -f coverage.txt
 
+  localnet:
+      working_directory: /home/circleci/.go_workspace/src/github.com/cosmos/cosmos-sdk
+      machine:
+        image: circleci/classic:latest
+      environment:
+        GOBIN: /home/circleci/.go_workspace/bin
+        GOPATH: /home/circleci/.go_workspace/
+        GOOS: linux
+        GOARCH: amd64
+      parallelism: 1
+      steps:
+        - checkout
+        - run:
+            name: run localnet and exit on failure
+            command: |
+              set -x
+              make get_tools
+              make get_vendor_deps
+              make build-linux
+              make localnet-start
+              ./scripts/localnet-blocks-test.sh 40 5 10 localhost
+
+
 workflows:
   version: 2
   test-suite:
@@ -167,6 +190,9 @@ workflows:
       - test_cover:
           requires:
             - setup_dependencies
+      - localnet:
+          requires:
+            - setup_dependencies
       - upload_coverage:
           requires:
             - test_cover
diff --git a/Makefile b/Makefile
@@ -16,20 +16,20 @@ ci: get_tools get_vendor_deps install test_cover test_lint test
 ########################################
 ### Build/Install
 
-check-ledger: 
+check-ledger:
 ifeq ($(LEDGER_ENABLED),true)
-   	ifeq ($(UNAME_S),OpenBSD)
-   		$(info "OpenBSD detected, disabling ledger support (https://github.com/cosmos/cosmos-sdk/issues/1988)")
-   	   	TMP_BUILD_TAGS := $(BUILD_TAGS)
-   	   	BUILD_TAGS = $(filter-out ledger, $(TMP_BUILD_TAGS))
-   	else
-   	   	ifndef GCC
-   	   	   $(error "gcc not installed for ledger support, please install or set LEDGER_ENABLED to false in the Makefile")
-   	   	endif
-   	endif
+    ifeq ($(UNAME_S),OpenBSD)
+        $(info "OpenBSD detected, disabling ledger support (https://github.com/cosmos/cosmos-sdk/issues/1988)")
+        TMP_BUILD_TAGS := $(BUILD_TAGS)
+        BUILD_TAGS = $(filter-out ledger, $(TMP_BUILD_TAGS))
+    else
+        ifndef GCC
+           $(error "gcc not installed for ledger support, please install or set LEDGER_ENABLED to false in the Makefile")
+        endif
+    endif
 else
-	TMP_BUILD_TAGS := $(BUILD_TAGS)
-	BUILD_TAGS = $(filter-out ledger, $(TMP_BUILD_TAGS))
+  TMP_BUILD_TAGS := $(BUILD_TAGS)
+  BUILD_TAGS = $(filter-out ledger, $(TMP_BUILD_TAGS))
 endif
 
 build: check-ledger
@@ -199,7 +199,7 @@ build-docker-gaiadnode:
 # Run a 4-node testnet locally
 localnet-start: localnet-stop
 	@if ! [ -f build/node0/gaiad/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/gaiad:Z tendermint/gaiadnode testnet --v 4 --o . --starting-ip-address 192.168.10.2 ; fi
-	docker-compose up
+	docker-compose up -d
 
 # Stop testnet
 localnet-stop:

diff --git a/PENDING.md b/PENDING.md
@@ -5,7 +5,20 @@ BREAKING CHANGES
 * Update to tendermint v0.23.0. This involves removing crypto.Pubkey,
 maintaining a validator address to pubkey map, and using time.Time instead of int64 for time. [SDK PR](https://github.com/cosmos/cosmos-sdk/pull/1927)
 
+<<<<<<< HEAD
 ## PENDING
+=======
+* Gaia REST API (`gaiacli advanced rest-server`)
+
+* Gaia CLI  (`gaiacli`)
+
+* Gaia
+    * Make the transient store key use a distinct store key.
+
+* SDK 
+
+* Tendermint 
+>>>>>>> 0d41026a... Rename transient store key to be a unique key.
 
 BREAKING CHANGES
 * API
@@ -77,6 +90,7 @@ IMPROVEMENTS
 * [x/stake] \#2000 Added tests for new staking endpoints
 * [x/stake] [#2023](https://github.com/cosmos/cosmos-sdk/pull/2023) Terminate iteration loop in `UpdateBondedValidators` and `UpdateBondedValidatorsFull` when the first revoked validator is encountered and perform a sanity check.
 * [tools] Make get_vendor_deps deletes `.vendor-new` directories, in case scratch files are present.
+* [ci] [#2057](https://github.com/cosmos/cosmos-sdk/pull/2057) Run `make localnet-start` on every commit and ensure network reaches at least 10 blocks
 
 BUG FIXES
 *  \#1988 Make us compile on OpenBSD (disable ledger) [#1988] (https://github.com/cosmos/cosmos-sdk/issues/1988)

diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go
@@ -78,7 +78,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
 		keyGov:           sdk.NewKVStoreKey("gov"),
 		keyFeeCollection: sdk.NewKVStoreKey("fee"),
 		keyParams:        sdk.NewKVStoreKey("params"),
-		tkeyParams:       sdk.NewTransientStoreKey("params"),
+		tkeyParams:       sdk.NewTransientStoreKey("transient_params"),
 	}
 
 	// define the accountMapper

diff --git a/scripts/localnet-blocks-test.sh b/scripts/localnet-blocks-test.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+CNT=0
+ITER=$1
+SLEEP=$2
+NUMBLOCKS=$3
+NODEADDR=$4
+
+if [ -z "$1" ]; then
+  echo "Need to input number of iterations to run..."
+  exit 1
+fi
+
+if [ -z "$2" ]; then
+  echo "Need to input number of seconds to sleep between iterations"
+  exit 1
+fi
+
+if [ -z "$3" ]; then
+  echo "Need to input block height to declare completion..."
+  exit 1
+fi
+
+if [ -z "$4" ]; then
+  echo "Need to input node address to poll..."
+  exit 1
+fi
+
+while [ ${CNT} -lt $ITER ]; do
+    var=$(curl -s $NODEADDR:26657/status | jq -r '.result.sync_info.latest_block_height')
+    echo "Number of Blocks: ${var}"
+    if [ ! -z ${var} ] && [ ${var} -gt ${NUMBLOCKS} ]; then
+      echo "Number of blocks reached, exiting success..."
+      exit 0
+    fi
+    let CNT=CNT+1
+    sleep $SLEEP
+done
+echo "Timeout reached, exiting failure..."
+exit 1