Fix tests; Update go-merkle API

example/dummy/dummy.go

@@ -14,7 +14,7 @@ type DummyApplication struct {
 }
 
 func NewDummyApplication() *DummyApplication {
-	state := merkle.NewIAVLTree(0, ".", nil)
+	state := merkle.NewIAVLTree(0, nil)
 	return &DummyApplication{state: state}
 }
 

example/dummy/persistent_dummy.go

@@ -35,7 +35,7 @@ func NewPersistentDummyApplication(dbDir string) *PersistentDummyApplication {
 	db := dbm.NewDB("dummy", "leveldb", dbDir)
 	lastBlock := LoadLastBlock(db)
 
-	stateTree := merkle.NewIAVLTree(0, ".", db)
+	stateTree := merkle.NewIAVLTree(0, db)
 	stateTree.Load(lastBlock.AppHash)
 
 	log.Notice("Loaded state", "block", lastBlock.BlockHeight, "root", stateTree.Hash())

tests/test_app/app.go

@@ -17,6 +17,7 @@ func StartApp(tmspApp string) *process.Process {
 	// Start the app
 	//outBuf := NewBufferCloser(nil)
 	proc, err := process.StartProcess("tmsp_app",
+		"",
 		"bash",
 		[]string{"-c", tmspApp},
 		nil,

tests/test_cli/ex1.tmsp.out

@@ -17,7 +17,7 @@
 
 > query abc
 -> code: OK
--> data: {{"index":0,"value":"abc","exists":true}}
+-> data: {Index=0 value=abc exists=true}
 
 > append_tx def=xyz
 -> code: OK
@@ -27,5 +27,5 @@
 
 > query def
 -> code: OK
--> data: {{"index":1,"value":"xyz","exists":true}}
+-> data: {Index=1 value=xyz exists=true}