TMSP -> ABCI

cmd/abci-cli/tmsp-cli.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	. "github.com/tendermint/go-common"
-	"github.com/tendermint/tmsp/client"
-	"github.com/tendermint/tmsp/types"
+	"github.com/tendermint/abci/client"
+	"github.com/tendermint/abci/types"
 	"github.com/urfave/cli"
 )
 
@@ -40,7 +40,7 @@ func newResponse(res types.Result, data string, printCode bool) *response {
 }
 
 // client is a global variable so it can be reused by the console
-var client tmspcli.Client
+var client abcicli.Client
 
 func main() {
 
@@ -48,8 +48,8 @@ func main() {
 	cli.OsExiter = func(_ int) {}
 
 	app := cli.NewApp()
-	app.Name = "tmsp-cli"
-	app.Usage = "tmsp-cli [command] [args...]"
+	app.Name = "abci-cli"
+	app.Usage = "abci-cli [command] [args...]"
 	app.Version = "0.2.1" // better error handling in console
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
@@ -58,7 +58,7 @@ func main() {
 			Usage: "address of application socket",
 		},
 		cli.StringFlag{
-			Name:  "tmsp",
+			Name:  "abci",
 			Value: "socket",
 			Usage: "socket or grpc",
 		},
@@ -70,14 +70,14 @@ func main() {
 	app.Commands = []cli.Command{
 		{
 			Name:  "batch",
-			Usage: "Run a batch of tmsp commands against an application",
+			Usage: "Run a batch of abci commands against an application",
 			Action: func(c *cli.Context) error {
 				return cmdBatch(app, c)
 			},
 		},
 		{
 			Name:  "console",
-			Usage: "Start an interactive tmsp console for multiple commands",
+			Usage: "Start an interactive abci console for multiple commands",
 			Action: func(c *cli.Context) error {
 				return cmdConsole(app, c)
 			},
@@ -143,7 +143,7 @@ func main() {
 func before(c *cli.Context) error {
 	if client == nil {
 		var err error
-		client, err = tmspcli.NewClient(c.GlobalString("address"), c.GlobalString("tmsp"), false)
+		client, err = abcicli.NewClient(c.GlobalString("address"), c.GlobalString("abci"), false)
 		if err != nil {
 			Exit(err.Error())
 		}

cmd/counter/main.go

@@ -4,20 +4,20 @@ import (
 	"flag"
 
 	. "github.com/tendermint/go-common"
-	"github.com/tendermint/tmsp/example/counter"
-	"github.com/tendermint/tmsp/server"
+	"github.com/tendermint/abci/example/counter"
+	"github.com/tendermint/abci/server"
 )
 
 func main() {
 
 	addrPtr := flag.String("addr", "tcp://0.0.0.0:46658", "Listen address")
-	tmspPtr := flag.String("tmsp", "socket", "TMSP server: socket | grpc")
+	abciPtr := flag.String("abci", "socket", "ABCI server: socket | grpc")
 	serialPtr := flag.Bool("serial", false, "Enforce incrementing (serial) txs")
 	flag.Parse()
 	app := counter.NewCounterApplication(*serialPtr)
 
 	// Start the listener
-	srv, err := server.NewServer(*addrPtr, *tmspPtr, app)
+	srv, err := server.NewServer(*addrPtr, *abciPtr, app)
 	if err != nil {
 		Exit(err.Error())
 	}

cmd/dummy/main.go

@@ -4,15 +4,15 @@ import (
 	"flag"
 
 	. "github.com/tendermint/go-common"
-	"github.com/tendermint/tmsp/example/dummy"
-	"github.com/tendermint/tmsp/server"
-	"github.com/tendermint/tmsp/types"
+	"github.com/tendermint/abci/example/dummy"
+	"github.com/tendermint/abci/server"
+	"github.com/tendermint/abci/types"
 )
 
 func main() {
 
 	addrPtr := flag.String("addr", "tcp://0.0.0.0:46658", "Listen address")
-	tmspPtr := flag.String("tmsp", "socket", "socket | grpc")
+	abciPtr := flag.String("abci", "socket", "socket | grpc")
 	persistencePtr := flag.String("persist", "", "directory to use for a database")
 	flag.Parse()
 
@@ -25,7 +25,7 @@ func main() {
 	}
 
 	// Start the listener
-	srv, err := server.NewServer(*addrPtr, *tmspPtr, app)
+	srv, err := server.NewServer(*addrPtr, *abciPtr, app)
 	if err != nil {
 		Exit(err.Error())
 	}