From c6c5e34c3a02ff8eba0b52c703fe0e5fa7bed630 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 4 Jul 2017 14:10:06 +0200
Subject: [PATCH] Fix shell-down tutorials

---
 docs/guide/basecoin-basics.md  | 28 ++++++++++++++--------------
 docs/guide/basecoin-plugins.md | 32 ++++++++++++++++----------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/docs/guide/basecoin-basics.md b/docs/guide/basecoin-basics.md
index 48278986e..f5e792e1b 100644
--- a/docs/guide/basecoin-basics.md
+++ b/docs/guide/basecoin-basics.md
@@ -2,47 +2,47 @@
 #!/bin/bash
 
 testTutorial_BasecoinBasics() {
-  
-    #shelldown[1][3] >/dev/null 
-    #shelldown[1][4] >/dev/null 
+
+    #shelldown[1][3] >/dev/null
+    #shelldown[1][4] >/dev/null
     KEYPASS=qwertyuiop
-  
+
     RES=$((echo $KEYPASS; echo $KEYPASS) | #shelldown[1][6])
     assertTrue "Line $LINENO: Expected to contain safe, got $RES" '[[ $RES == *safe* ]]'
     RES=$((echo $KEYPASS; echo $KEYPASS) | #shelldown[1][7])
     assertTrue "Line $LINENO: Expected to contain safe, got $RES" '[[ $RES == *safe* ]]'
-  
+
     #shelldown[3][-1]
     assertTrue "Expected true for line $LINENO" $?
-    
+
     #shelldown[4][-1] >>/dev/null 2>&1 &
     sleep 5
     PID_SERVER=$!
     disown
-  
+
     RES=$((echo y) | #shelldown[5][-1] $1)
     assertTrue "Line $LINENO: Expected to contain validator, got $RES" '[[ $RES == *validator* ]]'
-    
+
     #shelldown[6][0]
     #shelldown[6][1]
     RES=$(#shelldown[6][2] | jq '.data.coins[0].denom' | tr -d '"')
     assertTrue "Line $LINENO: Expected to have mycoins, got $RES" '[[ $RES == mycoin ]]'
     RES="$(#shelldown[6][3] 2>&1)"
     assertTrue "Line $LINENO: Expected to contain ERROR, got $RES" '[[ $RES == *ERROR* ]]'
-    
+
     RES=$((echo $KEYPASS) | #shelldown[7][-1] | jq '.deliver_tx.code')
     assertTrue "Line $LINENO: Expected 0 code deliver_tx, got $RES" '[[ $RES == 0 ]]'
-    
+
     RES=$(#shelldown[8][-1] | jq '.data.coins[0].amount')
     assertTrue "Line $LINENO: Expected to contain 1000 mycoin, got $RES" '[[ $RES == 1000 ]]'
-    
+
     RES=$((echo $KEYPASS) | #shelldown[9][-1] | jq '.deliver_tx.code')
     assertTrue "Line $LINENO: Expected 0 code deliver_tx, got $RES" '[[ $RES == 0 ]]'
-    
+
     RES=$((echo $KEYPASS) | #shelldown[10][-1])
     assertTrue "Line $LINENO: Expected to contain insufficient funds error, got $RES" \
-        '[[ $RES == *"insufficient funds"* ]]'
-    
+        '[[ $RES == *"Insufficient Funds"* ]]'
+
     #perform a substitution within the final tests
     HASH=$((echo $KEYPASS) | #shelldown[11][-1] | jq '.hash' | tr -d '"')
     PRESUB="#shelldown[12][-1]"
diff --git a/docs/guide/basecoin-plugins.md b/docs/guide/basecoin-plugins.md
index 2ca621c52..ad9ed615a 100644
--- a/docs/guide/basecoin-plugins.md
+++ b/docs/guide/basecoin-plugins.md
@@ -2,49 +2,49 @@
 #!/bin/bash
 
 testTutorial_BasecoinPlugins() {
-  
+
     #Initialization
     #shelldown[0][1]
     #shelldown[0][2]
     KEYPASS=qwertyuiop
- 
-    #Making Keys 
+
+    #Making Keys
     RES=$((echo $KEYPASS; echo $KEYPASS) | #shelldown[0][4])
     assertTrue "Line $LINENO: Expected to contain safe, got $RES" '[[ $RES == *safe* ]]'
     RES=$((echo $KEYPASS; echo $KEYPASS) | #shelldown[0][5])
     assertTrue "Line $LINENO: Expected to contain safe, got $RES" '[[ $RES == *safe* ]]'
-  
+
     #shelldown[0][7] >/dev/null
     assertTrue "Expected true for line $LINENO" $?
-    
+
     #shelldown[0][9] >>/dev/null 2>&1 &
     sleep 5
     PID_SERVER=$!
     disown
-  
+
     RES=$((echo y) | #shelldown[1][0] $1)
     assertTrue "Line $LINENO: Expected to contain validator, got $RES" '[[ $RES == *validator* ]]'
-    
+
     #shelldown[1][2]
     assertTrue "Expected true for line $LINENO" $?
     RES=$((echo $KEYPASS) | #shelldown[1][3] | jq '.deliver_tx.code')
     assertTrue "Line $LINENO: Expected 0 code deliver_tx, got $RES" '[[ $RES == 0 ]]'
-    
+
     RES=$((echo $KEYPASS) | #shelldown[2][0])
     assertTrue "Line $LINENO: Expected to contain Valid error, got $RES" \
-        '[[ $RES == *"Valid must be true"* ]]'
-    
+        '[[ $RES == *"Counter Tx marked invalid"* ]]'
+
     RES=$((echo $KEYPASS) | #shelldown[2][1] | jq '.deliver_tx.code')
     assertTrue "Line $LINENO: Expected 0 code deliver_tx, got $RES" '[[ $RES == 0 ]]'
 
-    RES=$(#shelldown[3][-1] | jq '.data.Counter')
+    RES=$(#shelldown[3][-1] | jq '.data.counter')
     assertTrue "Line $LINENO: Expected Counter of 1, got $RES" '[[ $RES == 1 ]]'
 
     RES=$((echo $KEYPASS) | #shelldown[4][0] | jq '.deliver_tx.code')
     assertTrue "Line $LINENO: Expected 0 code deliver_tx, got $RES" '[[ $RES == 0 ]]'
     RES=$(#shelldown[4][1])
-    RESCOUNT=$(printf "$RES" | jq '.data.Counter')
-    RESFEE=$(printf "$RES" | jq '.data.TotalFees[0].amount')
+    RESCOUNT=$(printf "$RES" | jq '.data.counter')
+    RESFEE=$(printf "$RES" | jq '.data.total_fees[0].amount')
     assertTrue "Line $LINENO: Expected Counter of 2, got $RES" '[[ $RESCOUNT == 2 ]]'
     assertTrue "Line $LINENO: Expected TotalFees of 2, got $RES" '[[ $RESFEE == 2 ]]'
 }
@@ -113,8 +113,8 @@ But the Counter has an additional command, `countercli tx counter`, which
 crafts an `AppTx` specifically for this plugin:
 
 ```shelldown[2]
-countercli tx counter --name cool --amount=1mycoin --sequence=2
-countercli tx counter --name cool --amount=1mycoin --sequence=3 --valid
+countercli tx counter --name cool --sequence=2
+countercli tx counter --name cool --sequence=3 --valid
 ```
 
 The first transaction is rejected by the plugin because it was not marked as
@@ -132,7 +132,7 @@ If we send another transaction, and then query again, we will see the value
 increment:
 
 ```shelldown[4]
-countercli tx counter --name cool --amount=2mycoin --sequence=4 --valid --countfee=2mycoin
+countercli tx counter --name cool --countfee=2mycoin --sequence=4 --valid
 countercli query counter
 ```