fix abci_cli tests

abci/tests/test_cli/ex1.abci

@@ -2,12 +2,11 @@ echo hello
 info
 prepare_proposal "abc"
 process_proposal "abc"
+finalize_block "abc"
 commit
-deliver_tx "abc"
 info
-commit
 query "abc"
-deliver_tx "def=xyz"
+finalize_block "def=xyz" "ghi=123"
 commit
 query "def"
 prepare_proposal "preparedef"

abci/tests/test_cli/ex1.abci.out

@@ -16,11 +16,12 @@
 -> code: OK
 -> status: ACCEPT
 
-> commit 
+> finalize_block "abc"
 -> code: OK
--> data.hex: 0x0000000000000000
+-> code: OK
+-> data.hex: 0x0200000000000000
 
-> deliver_tx "abc"
+> commit 
 -> code: OK
 
 > info 
@@ -28,30 +29,28 @@
 -> data: {"size":1}
 -> data.hex: 0x7B2273697A65223A317D
 
-> commit 
--> code: OK
--> data.hex: 0x0200000000000000
-
 > query "abc"
 -> code: OK
 -> log: exists
--> height: 2
+-> height: 1
 -> key: abc
 -> key.hex: 616263
 -> value: abc
 -> value.hex: 616263
 
-> deliver_tx "def=xyz"
+> finalize_block "def=xyz" "ghi=123"
 -> code: OK
+-> code: OK
+-> code: OK
+-> data.hex: 0x0600000000000000
 
 > commit 
 -> code: OK
--> data.hex: 0x0400000000000000
 
 > query "def"
 -> code: OK
 -> log: exists
--> height: 3
+-> height: 2
 -> key: def
 -> key.hex: 646566
 -> value: xyz
@@ -77,5 +76,4 @@
 
 > commit 
 -> code: OK
--> data.hex: 0x0400000000000000
 

abci/tests/test_cli/ex2.abci

@@ -1,7 +1,10 @@
 check_tx 0x00
 check_tx 0xff
-deliver_tx 0x00
+finalize_block 0x00
+commit
 check_tx 0x00
-deliver_tx 0x01
-deliver_tx 0x04
+finalize_block 0x01
+commit
+finalize_block 0x04
+commit
 info

abci/tests/test_cli/ex2.abci.out

@@ -4,16 +4,31 @@
 > check_tx 0xff
 -> code: OK
 
-> deliver_tx 0x00
+> finalize_block 0x00
+-> code: OK
+-> code: OK
+-> data.hex: 0x0200000000000000
+
+> commit 
 -> code: OK
 
 > check_tx 0x00
 -> code: OK
 
-> deliver_tx 0x01
+> finalize_block 0x01
+-> code: OK
+-> code: OK
+-> data.hex: 0x0400000000000000
+
+> commit 
 -> code: OK
 
-> deliver_tx 0x04
+> finalize_block 0x04
+-> code: OK
+-> code: OK
+-> data.hex: 0x0600000000000000
+
+> commit 
 -> code: OK
 
 > info