test: dont run cloud test on push to master

README.md

@@ -6,6 +6,16 @@ Simple, Secure, Scalable Blockchain Platform
 
 _NOTE: This is yet pre-alpha non-production-quality software._
 
+## App Developers
+
+Tendermint Core is Byzantine Fault Tolerant (BFT) middleware that takes an application, written in any programming language,
+and replicates it (ie. the latest state) on many machines.
+See the [application developers guide](guide://github.com/tendermint/tendermint/wiki/Application-Developers) to get started.
+
+## Contributing
+
+Yay open source! Please see our [contributing guidelines](https://github.com/tendermint/tendermint/wiki/Contributing).
+
 ## Resources
 
 ### Tendermint Core
@@ -29,37 +39,8 @@ _NOTE: This is yet pre-alpha non-production-quality software._
 * [Go-Merkle](http://github.com/tendermint/go-merkle)
 * 
 
-### Install
+## Install
 
-Make sure you have installed Go and [set the GOPATH](https://github.com/tendermint/tendermint/wiki/Setting-GOPATH).
+`go get -u github.com/tendermint/tendermint/cmd/tendermint`
 
-Install `glide`, used for dependency management:
+For more details, see the [install guide](https://github.com/tendermint/tendermint/wiki/Installation).
-
-```
-go get https://github.com/Masterminds/glide
-```
-
-Install tendermint:
-
-```
-mkdir -p $GOPATH/src/github.com/tendermint
-git clone https://github.com/tendermint/tendermint $GOPATH/src/github.com/tendermint/tendermint
-cd $GOPATH/src/github.com/tendermint/tendermint
-glide install
-go install ./cmd/tendermint
-```
-
-Initialize a sample tendermint directory with an example genesis file (in `~/.tendermint`):
-
-```
-tendermint init
-```
-
-Now run the tendermint node:
-
-```
-tendermint node --proxy_app=dummy
-```
-
-For tutorials on running other applications with Tendermint, and for launching test networks,
-see http://tendermint.com/guide/

state/execution.go

@@ -80,6 +80,8 @@ func (s *State) execBlockOnProxyApp(eventCache events.Fireable, proxyAppConn pro
 	}
 	proxyAppConn.SetResponseCallback(proxyCb)
 
+	// TODO: BeginBlock
+
 	// Run txs of block
 	for _, tx := range block.Txs {
 		proxyAppConn.AppendTxAsync(tx)

test/test.sh

@@ -1,19 +1,14 @@
 #! /bin/bash
 
-# integrations test
+# Top Level Testing Script
-# this is the script run by eg CircleCI.
+# See the github.com/tendermint/tendermint/test/README.md
-# It creates a docker container,
-# installs the dependencies,
-# and runs the tests.
-# If we pushed to STAGING or MASTER,
-# it will also run the tests for all dependencies
 
 echo ""
 echo "* building docker file"
 docker build -t tester -f ./test/Dockerfile .
 
 echo ""
-echo "* running go tests and broadcast tests"
+echo "* running go tests and app tests"
 docker run -t tester bash test/run_test.sh
 
 # test basic network connectivity
@@ -22,8 +17,9 @@ echo ""
 echo "* running basic peer tests"
 bash test/p2p/test.sh tester
 
+# only run the cloud benchmark for releases
 BRANCH=`git rev-parse --abbrev-ref HEAD`
-if [[ "$BRANCH" == "master" || $(echo "$BRANCH" | grep "release-") != "" ]]; then
+if [[ $(echo "$BRANCH" | grep "release-") != "" ]]; then
 	echo ""
 	echo "* branch $BRANCH; running mintnet/netmon throughput benchmark"
 	bash test/net/test.sh