Removed unnecessary code and tightened the start-tendermerk script.

idena-network · Jun 21, 2017 · e811189 · e811189
1 parent 4a5f1e1
commit e811189
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/app/state.go b/app/state.go
@@ -34,14 +34,7 @@ func (s State) Check() merkle.Tree {
 
 // Hash updates the tree
 func (s *State) Hash() []byte {
-	var hash []byte
-	if s.persistent {
-		// Don't save it right now, just calc the hash
-		hash = s.deliverTx.Hash()
-	} else {
-		hash = s.deliverTx.Hash()
-	}
-	return hash
+	return s.deliverTx.Hash()
 }
 
 // Commit save persistent nodes to the database and re-copies the trees

diff --git a/tests/tendermint/start-tendermerk.sh b/tests/tendermint/start-tendermerk.sh
@@ -8,6 +8,13 @@ merkleeyes start -d orphan-test-db --address=tcp://127.0.0.1:46658 >> merkleeyes
 
 rm -rf ~/.tendermint
 tendermint init
+
 tendermint node >> tendermint.log &
 
-sleep 5
+sleep 4
+
+TPID=`pidof tendermint`
+if [ -z "$TPID" ]; then
+	tail tendermint.log
+	exit 20
+fi