silly grpc client

cmd/counter/main.go

@@ -6,31 +6,20 @@ import (
 	. "github.com/tendermint/go-common"
 	"github.com/tendermint/tmsp/example/counter"
 	"github.com/tendermint/tmsp/server"
-	"github.com/tendermint/tmsp/types"
 )
 
 func main() {
 
 	addrPtr := flag.String("addr", "tcp://0.0.0.0:46658", "Listen address")
-	grpcPtr := flag.String("tmsp", "socket", "TMSP server: socket | grpc")
+	tmspPtr := flag.String("tmsp", "socket", "TMSP server: socket | grpc")
 	serialPtr := flag.Bool("serial", false, "Enforce incrementing (serial) txs")
 	flag.Parse()
 	app := counter.NewCounterApplication(*serialPtr)
 
 	// Start the listener
-	switch *grpcPtr {
-	case "socket":
-		_, err := server.NewServer(*addrPtr, app)
-		if err != nil {
-			Exit(err.Error())
-		}
-	case "grpc":
-		_, err := server.NewGRPCServer(*addrPtr, types.NewGRPCApplication(app))
-		if err != nil {
-			Exit(err.Error())
-		}
-	default:
-		Exit(Fmt("Unknown server type %s", *grpcPtr))
+	_, err := server.NewServer(*addrPtr, *tmspPtr, app)
+	if err != nil {
+		Exit(err.Error())
 	}
 
 	// Wait forever

cmd/dummy/main.go

@@ -11,10 +11,11 @@ import (
 func main() {
 
 	addrPtr := flag.String("addr", "tcp://0.0.0.0:46658", "Listen address")
+	tmspPtr := flag.String("tmsp", "socket", "socket | grpc")
 	flag.Parse()
 
 	// Start the listener
-	_, err := server.NewServer(*addrPtr, dummy.NewDummyApplication())
+	_, err := server.NewServer(*addrPtr, *tmspPtr, dummy.NewDummyApplication())
 	if err != nil {
 		Exit(err.Error())
 	}

cmd/tmsp-cli/tmsp-cli.go

@@ -29,6 +29,13 @@ func main() {
 			Usage: "address of application socket",
 		},
 	}
+	app.Flags = []cli.Flag{
+		cli.StringFlag{
+			Name:  "tmsp",
+			Value: "socket",
+			Usage: "socket or grpc",
+		},
+	}
 	app.Commands = []cli.Command{
 		{
 			Name:  "batch",
@@ -105,7 +112,7 @@ func main() {
 func before(c *cli.Context) error {
 	if client == nil {
 		var err error
-		client, err = tmspcli.NewClient(c.GlobalString("address"), false)
+		client, err = tmspcli.NewClient(c.GlobalString("address"), c.GlobalString("tmsp"), false)
 		if err != nil {
 			Exit(err.Error())
 		}