From df5cde74b01f02efe2b4eee8d1064f4fcae43376 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 13 Aug 2018 12:13:00 -0700
Subject: [PATCH] Back out pre-0.7.1 workaround

---
 ci/testnet-sanity.sh | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/ci/testnet-sanity.sh b/ci/testnet-sanity.sh
index 94c2fed7a..2329bb5ee 100755
--- a/ci/testnet-sanity.sh
+++ b/ci/testnet-sanity.sh
@@ -32,23 +32,19 @@ echo "--- $NET_URL: wallet sanity"
 )
 
 echo "--- $NET_URL: node count"
-if [[ $NET_URL = testnet.solana.com ]]; then
-  echo "TODO: Remove this block when a release > 0.7.0 is deployed"
+if [[ -n "$USE_SNAP" ]]; then
+  # TODO: Merge client.sh functionality into solana-bench-tps proper and
+  #       remove this USE_SNAP case
+  cmd=$solana_bench_tps
 else
-  if [[ -n "$USE_SNAP" ]]; then
-    # TODO: Merge client.sh functionality into solana-bench-tps proper and
-    #       remove this USE_SNAP case
-    cmd=$solana_bench_tps
-  else
-    cmd=multinode-demo/client.sh
-  fi
-
-  (
-    set -x
-    $cmd $NET_URL $EXPECTED_NODE_COUNT -c
-  )
+  cmd=multinode-demo/client.sh
 fi
 
+(
+  set -x
+  $cmd $NET_URL $EXPECTED_NODE_COUNT -c
+)
+
 echo "--- $NET_URL: validator sanity"
 if [[ -z $NO_VALIDATOR_SANITY ]]; then
   (