diff --git a/LICENSE b/LICENSE index 3934a10f..57951bb8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Tendermint TMSP +Tendermint ABCI Copyright (C) 2015 Tendermint diff --git a/Makefile b/Makefile index b00c5a67..22fa6fdd 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,13 @@ all: protoc test install -NOVENDOR = go list github.com/tendermint/tmsp/... | grep -v /vendor/ +NOVENDOR = go list github.com/tendermint/abci/... | grep -v /vendor/ protoc: protoc --go_out=plugins=grpc:. types/*.proto install: - go install github.com/tendermint/tmsp/cmd/... + go install github.com/tendermint/abci/cmd/... test: go test `${NOVENDOR}` diff --git a/README.md b/README.md index b4af06f0..8672af92 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,37 @@ -# Tendermint Socket Protocol (TMSP) +# Tendermint Socket Protocol (ABCI) -[![CircleCI](https://circleci.com/gh/tendermint/tmsp.svg?style=svg)](https://circleci.com/gh/tendermint/tmsp) +[![CircleCI](https://circleci.com/gh/tendermint/abci.svg?style=svg)](https://circleci.com/gh/tendermint/abci) Blockchains are a system for creating shared multi-master application state. -**TMSP** is a socket protocol enabling a blockchain consensus engine, running in one process, +**ABCI** is a socket protocol enabling a blockchain consensus engine, running in one process, to manage a blockchain application state, running in another. -For more information on TMSP, motivations, and tutorials, please visit [our blog post](http://tendermint.com/blog/tmsp-the-tendermint-socket-protocol/). +For more information on ABCI, motivations, and tutorials, please visit [our blog post](http://tendermint.com/blog/abci-the-tendermint-socket-protocol/). Other implementations: -* [cpp-tmsp](https://github.com/mdyring/cpp-tmsp) by Martin Dyring-Andersen -* [js-tmsp](https://github.com/tendermint/js-tmsp) -* [jTMSP](https://github.com/jTMSP/) for Java +* [cpp-abci](https://github.com/mdyring/cpp-abci) by Martin Dyring-Andersen +* [js-abci](https://github.com/tendermint/js-abci) +* [jABCI](https://github.com/jABCI/) for Java ## Contents This repository holds a number of important pieces: - `types/types.proto` - - the protobuf file defining TMSP message types, and the optional grpc interface. + - the protobuf file defining ABCI message types, and the optional grpc interface. - to build, run `make protoc` - see `protoc --help` and [the grpc docs](https://www.grpc.io/docs) for examples and details of other languages -- golang implementation of TMSP client and server +- golang implementation of ABCI client and server - two implementations: - asynchronous, ordered message passing over unix or tcp; - messages are serialized using protobuf and length prefixed - grpc - TendermintCore runs a client, and the application runs a server -- `cmd/tmsp-cli` - - command line tool wrapping the client for probing/testing a TMSP application - - use `tmsp-cli --version` to get the TMSP version +- `cmd/abci-cli` + - command line tool wrapping the client for probing/testing a ABCI application + - use `abci-cli --version` to get the ABCI version - examples: - the `cmd/counter` application, which illustrates nonce checking in txs @@ -42,15 +42,15 @@ This repository holds a number of important pieces: Since this is a streaming protocol, all messages are encoded with a length-prefix followed by the message encoded in Protobuf3. Protobuf3 doesn't have an official length-prefix standard, so we use our own. The first byte represents the length of the big-endian encoded length. -For example, if the Protobuf3 encoded TMSP message is `0xDEADBEEF` (4 bytes), the length-prefixed message is `0x0104DEADBEEF`. If the Protobuf3 encoded TMSP message is 65535 bytes long, the length-prefixed message would be like `0x02FFFF...`. +For example, if the Protobuf3 encoded ABCI message is `0xDEADBEEF` (4 bytes), the length-prefixed message is `0x0104DEADBEEF`. If the Protobuf3 encoded ABCI message is 65535 bytes long, the length-prefixed message would be like `0x02FFFF...`. Note this prefixing does not apply for grpc. ## Message types -TMSP requests/responses are simple Protobuf messages. Check out the [schema file](https://github.com/tendermint/tmsp/blob/master/types/types.proto). +ABCI requests/responses are simple Protobuf messages. Check out the [schema file](https://github.com/tendermint/abci/blob/master/types/types.proto). -#### AppendTx +#### DeliverTx * __Arguments__: * `Data ([]byte)`: The request transaction bytes * __Returns__: @@ -71,7 +71,7 @@ TMSP requests/responses are simple Protobuf messages. Check out the [schema fil Validate a mempool transaction, prior to broadcasting or proposing. This message should not mutate the main state, but application developers may want to keep a separate CheckTx state that gets reset upon Commit. - CheckTx can happen interspersed with AppendTx, but they happen on different connections - CheckTx from the mempool connection, and AppendTx from the consensus connection. During Commit, the mempool is locked, so you can reset the mempool state to the latest state after running all those appendtxs, and then the mempool will re run whatever txs it has against that latest mempool stte + CheckTx can happen interspersed with DeliverTx, but they happen on different connections - CheckTx from the mempool connection, and DeliverTx from the consensus connection. During Commit, the mempool is locked, so you can reset the mempool state to the latest state after running all those delivertxs, and then the mempool will re run whatever txs it has against that latest mempool stte Transactions are first run through CheckTx before broadcast to peers in the mempool layer. You can make CheckTx semi-stateful and clear the state upon `Commit` or `BeginBlock`, @@ -122,7 +122,7 @@ TMSP requests/responses are simple Protobuf messages. Check out the [schema fil * __Arguments__: * `Height (uint64)`: The block height that is starting * __Usage__:
- Signals the beginning of a new block. Called prior to any AppendTxs. + Signals the beginning of a new block. Called prior to any DeliverTxs. #### EndBlock * __Arguments__: @@ -148,8 +148,8 @@ TMSP requests/responses are simple Protobuf messages. Check out the [schema fil ##### Jan 23th, 2016 -* Added CheckTx/Query TMSP message types -* Added Result/Log fields to AppendTx/CheckTx/SetOption +* Added CheckTx/Query ABCI message types +* Added Result/Log fields to DeliverTx/CheckTx/SetOption * Removed Listener messages * Removed Code from ResponseSetOption and ResponseGetHash * Made examples BigEndian @@ -160,4 +160,4 @@ TMSP requests/responses are simple Protobuf messages. Check out the [schema fil ##### Jan 8th, 2016 -* Tendermint/TMSP now comes to consensus on the order first before AppendTx. +* Tendermint/ABCI now comes to consensus on the order first before DeliverTx. diff --git a/client/client.go b/client/client.go index c3c1e151..8ea29593 100644 --- a/client/client.go +++ b/client/client.go @@ -1,11 +1,11 @@ -package tmspcli +package abcicli import ( "fmt" "sync" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) type Client interface { @@ -18,7 +18,7 @@ type Client interface { EchoAsync(msg string) *ReqRes InfoAsync() *ReqRes SetOptionAsync(key string, value string) *ReqRes - AppendTxAsync(tx []byte) *ReqRes + DeliverTxAsync(tx []byte) *ReqRes CheckTxAsync(tx []byte) *ReqRes QueryAsync(tx []byte) *ReqRes CommitAsync() *ReqRes @@ -27,7 +27,7 @@ type Client interface { EchoSync(msg string) (res types.Result) InfoSync() (resInfo types.ResponseInfo, err error) SetOptionSync(key string, value string) (res types.Result) - AppendTxSync(tx []byte) (res types.Result) + DeliverTxSync(tx []byte) (res types.Result) CheckTxSync(tx []byte) (res types.Result) QuerySync(tx []byte) (res types.Result) CommitSync() (res types.Result) @@ -50,7 +50,7 @@ func NewClient(addr, transport string, mustConnect bool) (client Client, err err case "grpc": client, err = NewGRPCClient(addr, mustConnect) default: - err = fmt.Errorf("Unknown tmsp transport %s", transport) + err = fmt.Errorf("Unknown abci transport %s", transport) } return diff --git a/client/grpc_client.go b/client/grpc_client.go index 15cda522..566ee183 100644 --- a/client/grpc_client.go +++ b/client/grpc_client.go @@ -1,4 +1,4 @@ -package tmspcli +package abcicli import ( "net" @@ -9,7 +9,7 @@ import ( grpc "google.golang.org/grpc" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) // A stripped copy of the remoteClient that makes @@ -18,7 +18,7 @@ type grpcClient struct { BaseService mustConnect bool - client types.TMSPApplicationClient + client types.ABCIApplicationClient mtx sync.Mutex addr string @@ -50,13 +50,13 @@ RETRY_LOOP: if cli.mustConnect { return err } else { - log.Warn(Fmt("tmsp.grpcClient failed to connect to %v. Retrying...\n", cli.addr)) + log.Warn(Fmt("abci.grpcClient failed to connect to %v. Retrying...\n", cli.addr)) time.Sleep(time.Second * 3) continue RETRY_LOOP } } - client := types.NewTMSPApplicationClient(conn) + client := types.NewABCIApplicationClient(conn) ENSURE_CONNECTED: for { @@ -93,7 +93,7 @@ func (cli *grpcClient) StopForError(err error) { } cli.mtx.Unlock() - log.Warn(Fmt("Stopping tmsp.grpcClient for error: %v", err.Error())) + log.Warn(Fmt("Stopping abci.grpcClient for error: %v", err.Error())) cli.Stop() } @@ -155,13 +155,13 @@ func (cli *grpcClient) SetOptionAsync(key string, value string) *ReqRes { return cli.finishAsyncCall(req, &types.Response{&types.Response_SetOption{res}}) } -func (cli *grpcClient) AppendTxAsync(tx []byte) *ReqRes { - req := types.ToRequestAppendTx(tx) - res, err := cli.client.AppendTx(context.Background(), req.GetAppendTx(), grpc.FailFast(true)) +func (cli *grpcClient) DeliverTxAsync(tx []byte) *ReqRes { + req := types.ToRequestDeliverTx(tx) + res, err := cli.client.DeliverTx(context.Background(), req.GetDeliverTx(), grpc.FailFast(true)) if err != nil { cli.StopForError(err) } - return cli.finishAsyncCall(req, &types.Response{&types.Response_AppendTx{res}}) + return cli.finishAsyncCall(req, &types.Response{&types.Response_DeliverTx{res}}) } func (cli *grpcClient) CheckTxAsync(tx []byte) *ReqRes { @@ -283,12 +283,12 @@ func (cli *grpcClient) SetOptionSync(key string, value string) (res types.Result return types.Result{Code: OK, Data: nil, Log: resp.Log} } -func (cli *grpcClient) AppendTxSync(tx []byte) (res types.Result) { - reqres := cli.AppendTxAsync(tx) +func (cli *grpcClient) DeliverTxSync(tx []byte) (res types.Result) { + reqres := cli.DeliverTxAsync(tx) if res := cli.checkErrGetResult(); res.IsErr() { return res } - resp := reqres.Response.GetAppendTx() + resp := reqres.Response.GetDeliverTx() return types.Result{Code: resp.Code, Data: resp.Data, Log: resp.Log} } diff --git a/client/local_client.go b/client/local_client.go index ee5d6f28..b787eb36 100644 --- a/client/local_client.go +++ b/client/local_client.go @@ -1,10 +1,10 @@ -package tmspcli +package abcicli import ( "sync" . "github.com/tendermint/go-common" - types "github.com/tendermint/tmsp/types" + types "github.com/tendermint/abci/types" ) type localClient struct { @@ -69,13 +69,13 @@ func (app *localClient) SetOptionAsync(key string, value string) *ReqRes { ) } -func (app *localClient) AppendTxAsync(tx []byte) *ReqRes { +func (app *localClient) DeliverTxAsync(tx []byte) *ReqRes { app.mtx.Lock() - res := app.Application.AppendTx(tx) + res := app.Application.DeliverTx(tx) app.mtx.Unlock() return app.callback( - types.ToRequestAppendTx(tx), - types.ToResponseAppendTx(res.Code, res.Data, res.Log), + types.ToRequestDeliverTx(tx), + types.ToResponseDeliverTx(res.Code, res.Data, res.Log), ) } @@ -171,9 +171,9 @@ func (app *localClient) SetOptionSync(key string, value string) (res types.Resul return types.OK.SetLog(log) } -func (app *localClient) AppendTxSync(tx []byte) (res types.Result) { +func (app *localClient) DeliverTxSync(tx []byte) (res types.Result) { app.mtx.Lock() - res = app.Application.AppendTx(tx) + res = app.Application.DeliverTx(tx) app.mtx.Unlock() return res } diff --git a/client/log.go b/client/log.go index deadf6c3..944b05ba 100644 --- a/client/log.go +++ b/client/log.go @@ -1,7 +1,7 @@ -package tmspcli +package abcicli import ( "github.com/tendermint/go-logger" ) -var log = logger.New("module", "tmspcli") +var log = logger.New("module", "abcicli") diff --git a/client/socket_client.go b/client/socket_client.go index aecaeea5..9b4f9aed 100644 --- a/client/socket_client.go +++ b/client/socket_client.go @@ -1,4 +1,4 @@ -package tmspcli +package abcicli import ( "bufio" @@ -11,7 +11,7 @@ import ( "time" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) const ( @@ -70,7 +70,7 @@ RETRY_LOOP: if cli.mustConnect { return err } else { - log.Warn(Fmt("tmsp.socketClient failed to connect to %v. Retrying...", cli.addr)) + log.Warn(Fmt("abci.socketClient failed to connect to %v. Retrying...", cli.addr)) time.Sleep(time.Second * 3) continue RETRY_LOOP } @@ -109,7 +109,7 @@ func (cli *socketClient) StopForError(err error) { } cli.mtx.Unlock() - log.Warn(Fmt("Stopping tmsp.socketClient for error: %v", err.Error())) + log.Warn(Fmt("Stopping abci.socketClient for error: %v", err.Error())) cli.Stop() } @@ -243,8 +243,8 @@ func (cli *socketClient) SetOptionAsync(key string, value string) *ReqRes { return cli.queueRequest(types.ToRequestSetOption(key, value)) } -func (cli *socketClient) AppendTxAsync(tx []byte) *ReqRes { - return cli.queueRequest(types.ToRequestAppendTx(tx)) +func (cli *socketClient) DeliverTxAsync(tx []byte) *ReqRes { + return cli.queueRequest(types.ToRequestDeliverTx(tx)) } func (cli *socketClient) CheckTxAsync(tx []byte) *ReqRes { @@ -315,13 +315,13 @@ func (cli *socketClient) SetOptionSync(key string, value string) (res types.Resu return types.Result{Code: OK, Data: nil, Log: resp.Log} } -func (cli *socketClient) AppendTxSync(tx []byte) (res types.Result) { - reqres := cli.queueRequest(types.ToRequestAppendTx(tx)) +func (cli *socketClient) DeliverTxSync(tx []byte) (res types.Result) { + reqres := cli.queueRequest(types.ToRequestDeliverTx(tx)) cli.FlushSync() if err := cli.Error(); err != nil { return types.ErrInternalError.SetLog(err.Error()) } - resp := reqres.Response.GetAppendTx() + resp := reqres.Response.GetDeliverTx() return types.Result{Code: resp.Code, Data: resp.Data, Log: resp.Log} } @@ -429,8 +429,8 @@ func resMatchesReq(req *types.Request, res *types.Response) (ok bool) { _, ok = res.Value.(*types.Response_Info) case *types.Request_SetOption: _, ok = res.Value.(*types.Response_SetOption) - case *types.Request_AppendTx: - _, ok = res.Value.(*types.Response_AppendTx) + case *types.Request_DeliverTx: + _, ok = res.Value.(*types.Response_DeliverTx) case *types.Request_CheckTx: _, ok = res.Value.(*types.Response_CheckTx) case *types.Request_Commit: diff --git a/cmd/tmsp-cli/tmsp-cli.go b/cmd/abci-cli/tmsp-cli.go similarity index 92% rename from cmd/tmsp-cli/tmsp-cli.go rename to cmd/abci-cli/tmsp-cli.go index 2bf5b862..b8bc2937 100644 --- a/cmd/tmsp-cli/tmsp-cli.go +++ b/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) }, @@ -104,10 +104,10 @@ func main() { }, }, { - Name: "append_tx", - Usage: "Append a new tx to application", + Name: "deliver_tx", + Usage: "Deliver a new tx to application", Action: func(c *cli.Context) error { - return cmdAppendTx(c) + return cmdDeliverTx(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()) } @@ -250,16 +250,16 @@ func cmdSetOption(c *cli.Context) error { } // Append a new tx to application -func cmdAppendTx(c *cli.Context) error { +func cmdDeliverTx(c *cli.Context) error { args := c.Args() if len(args) != 1 { - return errors.New("Command append_tx takes 1 argument") + return errors.New("Command deliver_tx takes 1 argument") } txBytes, err := stringOrHexToBytes(c.Args()[0]) if err != nil { return err } - res := client.AppendTxSync(txBytes) + res := client.DeliverTxSync(txBytes) rsp := newResponse(res, string(res.Data), true) printResponse(c, rsp) return nil diff --git a/cmd/counter/main.go b/cmd/counter/main.go index 0f284af9..218224a0 100644 --- a/cmd/counter/main.go +++ b/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()) } diff --git a/cmd/dummy/main.go b/cmd/dummy/main.go index fe7ae750..aecb1138 100644 --- a/cmd/dummy/main.go +++ b/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()) } diff --git a/example/chain_aware/chain_aware_app.go b/example/chain_aware/chain_aware_app.go index cd91c682..e3543f13 100644 --- a/example/chain_aware/chain_aware_app.go +++ b/example/chain_aware/chain_aware_app.go @@ -4,18 +4,18 @@ import ( "flag" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/server" - "github.com/tendermint/tmsp/types" + "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") flag.Parse() // Start the listener - srv, err := server.NewServer(*addrPtr, *tmspPtr, NewChainAwareApplication()) + srv, err := server.NewServer(*addrPtr, *abciPtr, NewChainAwareApplication()) if err != nil { Exit(err.Error()) } @@ -45,7 +45,7 @@ func (app *ChainAwareApplication) SetOption(key string, value string) (log strin return "" } -func (app *ChainAwareApplication) AppendTx(tx []byte) types.Result { +func (app *ChainAwareApplication) DeliverTx(tx []byte) types.Result { return types.NewResultOK(nil, "") } diff --git a/example/chain_aware/chain_aware_test.go b/example/chain_aware/chain_aware_test.go index fd375470..f5283a38 100644 --- a/example/chain_aware/chain_aware_test.go +++ b/example/chain_aware/chain_aware_test.go @@ -6,9 +6,9 @@ import ( "testing" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/client" - "github.com/tendermint/tmsp/server" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/client" + "github.com/tendermint/abci/server" + "github.com/tendermint/abci/types" ) func TestChainAware(t *testing.T) { @@ -23,7 +23,7 @@ func TestChainAware(t *testing.T) { defer srv.Stop() // Connect to the socket - client, err := tmspcli.NewSocketClient("unix://test.sock", false) + client, err := abcicli.NewSocketClient("unix://test.sock", false) if err != nil { Exit(Fmt("Error starting socket client: %v", err.Error())) } diff --git a/example/counter/counter.go b/example/counter/counter.go index 221ddf04..90be6d92 100644 --- a/example/counter/counter.go +++ b/example/counter/counter.go @@ -4,7 +4,7 @@ import ( "encoding/binary" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) type CounterApplication struct { @@ -28,7 +28,7 @@ func (app *CounterApplication) SetOption(key string, value string) (log string) return "" } -func (app *CounterApplication) AppendTx(tx []byte) types.Result { +func (app *CounterApplication) DeliverTx(tx []byte) types.Result { if app.serial { if len(tx) > 8 { return types.ErrEncodingError.SetLog(Fmt("Max tx size is 8 bytes, got %d", len(tx))) diff --git a/example/dummy/README.md b/example/dummy/README.md index 19f82fda..8c1f0f04 100644 --- a/example/dummy/README.md +++ b/example/dummy/README.md @@ -14,7 +14,7 @@ The app has no replay protection (other than what the mempool provides). The PersistentDummyApplication wraps the DummyApplication and provides two additional features: -1) persistence of state across app restarts (using Tendermint's TMSP-Handshake mechanism) +1) persistence of state across app restarts (using Tendermint's ABCI-Handshake mechanism) 2) validator set changes The state is persisted in leveldb along with the last block committed, diff --git a/example/dummy/dummy.go b/example/dummy/dummy.go index ca7bc525..648ef07e 100644 --- a/example/dummy/dummy.go +++ b/example/dummy/dummy.go @@ -7,7 +7,7 @@ import ( . "github.com/tendermint/go-common" "github.com/tendermint/go-merkle" "github.com/tendermint/go-wire" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) type DummyApplication struct { @@ -28,7 +28,7 @@ func (app *DummyApplication) SetOption(key string, value string) (log string) { } // tx is either "key=value" or just arbitrary bytes -func (app *DummyApplication) AppendTx(tx []byte) types.Result { +func (app *DummyApplication) DeliverTx(tx []byte) types.Result { parts := strings.Split(string(tx), "=") if len(parts) == 2 { app.state.Set([]byte(parts[0]), []byte(parts[1])) diff --git a/example/dummy/dummy_test.go b/example/dummy/dummy_test.go index f1287c9d..d2294347 100644 --- a/example/dummy/dummy_test.go +++ b/example/dummy/dummy_test.go @@ -9,14 +9,14 @@ import ( . "github.com/tendermint/go-common" "github.com/tendermint/go-crypto" "github.com/tendermint/go-wire" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) func testDummy(t *testing.T, dummy types.Application, tx []byte, key, value string) { - if r := dummy.AppendTx(tx); r.IsErr() { + if r := dummy.DeliverTx(tx); r.IsErr() { t.Fatal(r) } - if r := dummy.AppendTx(tx); r.IsErr() { + if r := dummy.DeliverTx(tx); r.IsErr() { t.Fatal(r) } @@ -49,7 +49,7 @@ func TestDummyKV(t *testing.T) { } func TestPersistentDummyKV(t *testing.T) { - dir, err := ioutil.TempDir("/tmp", "tmsp-dummy-test") // TODO + dir, err := ioutil.TempDir("/tmp", "abci-dummy-test") // TODO if err != nil { t.Fatal(err) } @@ -65,7 +65,7 @@ func TestPersistentDummyKV(t *testing.T) { } func TestPersistentDummyInfo(t *testing.T) { - dir, err := ioutil.TempDir("/tmp", "tmsp-dummy-test") // TODO + dir, err := ioutil.TempDir("/tmp", "abci-dummy-test") // TODO if err != nil { t.Fatal(err) } @@ -96,7 +96,7 @@ func TestPersistentDummyInfo(t *testing.T) { // add a validator, remove a validator, update a validator func TestValSetChanges(t *testing.T) { - dir, err := ioutil.TempDir("/tmp", "tmsp-dummy-test") // TODO + dir, err := ioutil.TempDir("/tmp", "abci-dummy-test") // TODO if err != nil { t.Fatal(err) } @@ -175,7 +175,7 @@ func makeApplyBlock(t *testing.T, dummy types.Application, heightInt int, diff [ dummyChain := dummy.(types.BlockchainAware) // hmm... dummyChain.BeginBlock(hash, header) for _, tx := range txs { - if r := dummy.AppendTx(tx); r.IsErr() { + if r := dummy.DeliverTx(tx); r.IsErr() { t.Fatal(r) } } diff --git a/example/dummy/persistent_dummy.go b/example/dummy/persistent_dummy.go index dc774ca3..fa730bcb 100644 --- a/example/dummy/persistent_dummy.go +++ b/example/dummy/persistent_dummy.go @@ -10,7 +10,7 @@ import ( dbm "github.com/tendermint/go-db" "github.com/tendermint/go-merkle" "github.com/tendermint/go-wire" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) const ( @@ -59,7 +59,7 @@ func (app *PersistentDummyApplication) SetOption(key string, value string) (log } // tx is either "key=value" or just arbitrary bytes -func (app *PersistentDummyApplication) AppendTx(tx []byte) types.Result { +func (app *PersistentDummyApplication) DeliverTx(tx []byte) types.Result { // if it starts with "val:", update the validator set // format is "val:pubkey/power" if isValidatorTx(tx) { @@ -69,7 +69,7 @@ func (app *PersistentDummyApplication) AppendTx(tx []byte) types.Result { } // otherwise, update the key-value store - return app.app.AppendTx(tx) + return app.app.DeliverTx(tx) } func (app *PersistentDummyApplication) CheckTx(tx []byte) types.Result { diff --git a/example/example_test.go b/example/example_test.go index 3293be55..1ddefddb 100644 --- a/example/example_test.go +++ b/example/example_test.go @@ -11,11 +11,11 @@ import ( "google.golang.org/grpc" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/client" - "github.com/tendermint/tmsp/example/dummy" - nilapp "github.com/tendermint/tmsp/example/nil" - "github.com/tendermint/tmsp/server" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/client" + "github.com/tendermint/abci/example/dummy" + nilapp "github.com/tendermint/abci/example/nil" + "github.com/tendermint/abci/server" + "github.com/tendermint/abci/types" ) func TestDummy(t *testing.T) { @@ -35,7 +35,7 @@ func TestGRPC(t *testing.T) { func testStream(t *testing.T, app types.Application) { - numAppendTxs := 200000 + numDeliverTxs := 200000 // Start the listener server, err := server.NewSocketServer("unix://test.sock", app) @@ -45,7 +45,7 @@ func testStream(t *testing.T, app types.Application) { defer server.Stop() // Connect to the socket - client, err := tmspcli.NewSocketClient("unix://test.sock", false) + client, err := abcicli.NewSocketClient("unix://test.sock", false) if err != nil { Exit(Fmt("Error starting socket client: %v", err.Error())) } @@ -57,15 +57,15 @@ func testStream(t *testing.T, app types.Application) { client.SetResponseCallback(func(req *types.Request, res *types.Response) { // Process response switch r := res.Value.(type) { - case *types.Response_AppendTx: + case *types.Response_DeliverTx: counter += 1 - if r.AppendTx.Code != types.CodeType_OK { - t.Error("AppendTx failed with ret_code", r.AppendTx.Code) + if r.DeliverTx.Code != types.CodeType_OK { + t.Error("DeliverTx failed with ret_code", r.DeliverTx.Code) } - if counter > numAppendTxs { - t.Fatalf("Too many AppendTx responses. Got %d, expected %d", counter, numAppendTxs) + if counter > numDeliverTxs { + t.Fatalf("Too many DeliverTx responses. Got %d, expected %d", counter, numDeliverTxs) } - if counter == numAppendTxs { + if counter == numDeliverTxs { go func() { time.Sleep(time.Second * 2) // Wait for a bit to allow counter overflow close(done) @@ -80,9 +80,9 @@ func testStream(t *testing.T, app types.Application) { }) // Write requests - for counter := 0; counter < numAppendTxs; counter++ { + for counter := 0; counter < numDeliverTxs; counter++ { // Send request - reqRes := client.AppendTxAsync([]byte("test")) + reqRes := client.DeliverTxAsync([]byte("test")) _ = reqRes // check err ? @@ -108,7 +108,7 @@ func dialerFunc(addr string, timeout time.Duration) (net.Conn, error) { func testGRPCSync(t *testing.T, app *types.GRPCApplication) { - numAppendTxs := 2000 + numDeliverTxs := 2000 // Start the listener server, err := server.NewGRPCServer("unix://test.sock", app) @@ -124,24 +124,24 @@ func testGRPCSync(t *testing.T, app *types.GRPCApplication) { } defer conn.Close() - client := types.NewTMSPApplicationClient(conn) + client := types.NewABCIApplicationClient(conn) // Write requests - for counter := 0; counter < numAppendTxs; counter++ { + for counter := 0; counter < numDeliverTxs; counter++ { // Send request - response, err := client.AppendTx(context.Background(), &types.RequestAppendTx{[]byte("test")}) + response, err := client.DeliverTx(context.Background(), &types.RequestDeliverTx{[]byte("test")}) if err != nil { - t.Fatalf("Error in GRPC AppendTx: %v", err.Error()) + t.Fatalf("Error in GRPC DeliverTx: %v", err.Error()) } counter += 1 if response.Code != types.CodeType_OK { - t.Error("AppendTx failed with ret_code", response.Code) + t.Error("DeliverTx failed with ret_code", response.Code) } - if counter > numAppendTxs { - t.Fatal("Too many AppendTx responses") + if counter > numDeliverTxs { + t.Fatal("Too many DeliverTx responses") } t.Log("response", counter) - if counter == numAppendTxs { + if counter == numDeliverTxs { go func() { time.Sleep(time.Second * 2) // Wait for a bit to allow counter overflow }() diff --git a/example/js/README.md b/example/js/README.md index f1875506..1bef9cbf 100644 --- a/example/js/README.md +++ b/example/js/README.md @@ -1 +1 @@ -This example has been moved here: https://github.com/tendermint/js-tmsp/tree/master/example +This example has been moved here: https://github.com/tendermint/js-abci/tree/master/example diff --git a/example/nil/nil_app.go b/example/nil/nil_app.go index 7cc01c05..cd57f0d9 100644 --- a/example/nil/nil_app.go +++ b/example/nil/nil_app.go @@ -1,7 +1,7 @@ package nilapp import ( - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) type NilApplication struct { @@ -19,7 +19,7 @@ func (app *NilApplication) SetOption(key string, value string) (log string) { return "" } -func (app *NilApplication) AppendTx(tx []byte) types.Result { +func (app *NilApplication) DeliverTx(tx []byte) types.Result { return types.NewResultOK(nil, "") } diff --git a/example/python/tmsp/__init__.py b/example/python/abci/__init__.py similarity index 100% rename from example/python/tmsp/__init__.py rename to example/python/abci/__init__.py diff --git a/example/python/tmsp/msg.py b/example/python/abci/msg.py similarity index 89% rename from example/python/tmsp/msg.py rename to example/python/abci/msg.py index a03c0a07..7329f585 100644 --- a/example/python/tmsp/msg.py +++ b/example/python/abci/msg.py @@ -6,14 +6,14 @@ message_types = { 0x02: "flush", 0x03: "info", 0x04: "set_option", - 0x21: "append_tx", + 0x21: "deliver_tx", 0x22: "check_tx", 0x23: "commit", 0x24: "add_listener", 0x25: "rm_listener", } -# return the decoded arguments of tmsp messages +# return the decoded arguments of abci messages class RequestDecoder(): @@ -32,7 +32,7 @@ class RequestDecoder(): def set_option(self): return decode_string(self.reader), decode_string(self.reader) - def append_tx(self): + def deliver_tx(self): return decode_string(self.reader) def check_tx(self): diff --git a/example/python/tmsp/reader.py b/example/python/abci/reader.py similarity index 100% rename from example/python/tmsp/reader.py rename to example/python/abci/reader.py diff --git a/example/python/tmsp/server.py b/example/python/abci/server.py similarity index 98% rename from example/python/tmsp/server.py rename to example/python/abci/server.py index 60f76e3a..40d50896 100644 --- a/example/python/tmsp/server.py +++ b/example/python/abci/server.py @@ -26,9 +26,9 @@ class Connection(): raise IOError("dead connection") this.recBuf.write(data) -# TMSP server responds to messges by calling methods on the app +# ABCI server responds to messges by calling methods on the app -class TMSPServer(): +class ABCIServer(): def __init__(self, app, port=5410): self.app = app diff --git a/example/python/tmsp/wire.py b/example/python/abci/wire.py similarity index 100% rename from example/python/tmsp/wire.py rename to example/python/abci/wire.py diff --git a/example/python/app.py b/example/python/app.py index b8cfcca8..a44ff345 100644 --- a/example/python/app.py +++ b/example/python/app.py @@ -1,8 +1,8 @@ import sys -from tmsp.wire import hex2bytes, decode_big_endian, encode_big_endian -from tmsp.server import TMSPServer -from tmsp.reader import BytesBuffer +from abci.wire import hex2bytes, decode_big_endian, encode_big_endian +from abci.server import ABCIServer +from abci.reader import BytesBuffer class CounterApplication(): @@ -24,7 +24,7 @@ class CounterApplication(): self.serial = True return 0 - def append_tx(self, txBytes): + def deliver_tx(self, txBytes): if self.serial: txByteArray = bytearray(txBytes) if len(txBytes) >= 2 and txBytes[:2] == "0x": @@ -75,8 +75,8 @@ if __name__ == '__main__': print "too many arguments" quit() - print 'TMSP Demo APP (Python)' + print 'ABCI Demo APP (Python)' app = CounterApplication() - server = TMSPServer(app, port) + server = ABCIServer(app, port) server.main_loop() diff --git a/example/python3/tmsp/__init__.py b/example/python3/abci/__init__.py similarity index 100% rename from example/python3/tmsp/__init__.py rename to example/python3/abci/__init__.py diff --git a/example/python3/tmsp/msg.py b/example/python3/abci/msg.py similarity index 89% rename from example/python3/tmsp/msg.py rename to example/python3/abci/msg.py index ae30f88d..807c4b6b 100644 --- a/example/python3/tmsp/msg.py +++ b/example/python3/abci/msg.py @@ -6,14 +6,14 @@ message_types = { 0x02: "flush", 0x03: "info", 0x04: "set_option", - 0x21: "append_tx", + 0x21: "deliver_tx", 0x22: "check_tx", 0x23: "commit", 0x24: "add_listener", 0x25: "rm_listener", } -# return the decoded arguments of tmsp messages +# return the decoded arguments of abci messages class RequestDecoder(): @@ -32,7 +32,7 @@ class RequestDecoder(): def set_option(self): return decode_string(self.reader), decode_string(self.reader) - def append_tx(self): + def deliver_tx(self): return decode_string(self.reader) def check_tx(self): diff --git a/example/python3/tmsp/reader.py b/example/python3/abci/reader.py similarity index 100% rename from example/python3/tmsp/reader.py rename to example/python3/abci/reader.py diff --git a/example/python3/tmsp/server.py b/example/python3/abci/server.py similarity index 98% rename from example/python3/tmsp/server.py rename to example/python3/abci/server.py index 03735bb3..04063262 100644 --- a/example/python3/tmsp/server.py +++ b/example/python3/abci/server.py @@ -29,9 +29,9 @@ class Connection(): raise IOError("dead connection") this.recBuf.write(data) -# TMSP server responds to messges by calling methods on the app +# ABCI server responds to messges by calling methods on the app -class TMSPServer(): +class ABCIServer(): def __init__(self, app, port=5410): self.app = app diff --git a/example/python3/tmsp/wire.py b/example/python3/abci/wire.py similarity index 100% rename from example/python3/tmsp/wire.py rename to example/python3/abci/wire.py diff --git a/example/python3/app.py b/example/python3/app.py index c3d11490..b40041a4 100644 --- a/example/python3/app.py +++ b/example/python3/app.py @@ -1,8 +1,8 @@ import sys -from tmsp.wire import hex2bytes, decode_big_endian, encode_big_endian -from tmsp.server import TMSPServer -from tmsp.reader import BytesBuffer +from abci.wire import hex2bytes, decode_big_endian, encode_big_endian +from abci.server import ABCIServer +from abci.reader import BytesBuffer class CounterApplication(): @@ -24,7 +24,7 @@ class CounterApplication(): self.serial = True return 0 - def append_tx(self, txBytes): + def deliver_tx(self, txBytes): if self.serial: txByteArray = bytearray(txBytes) if len(txBytes) >= 2 and txBytes[:2] == "0x": @@ -75,8 +75,8 @@ if __name__ == '__main__': print("too many arguments") quit() - print('TMSP Demo APP (Python)') + print('ABCI Demo APP (Python)') app = CounterApplication() - server = TMSPServer(app, port) + server = ABCIServer(app, port) server.main_loop() diff --git a/glide.yaml b/glide.yaml index 440d47cc..fae5a984 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/tendermint/tmsp +package: github.com/tendermint/abci import: - package: github.com/golang/protobuf subpackages: diff --git a/server/grpc_server.go b/server/grpc_server.go index 472da25d..1acd45a3 100644 --- a/server/grpc_server.go +++ b/server/grpc_server.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) // var maxNumberConnections = 2 @@ -20,10 +20,10 @@ type GRPCServer struct { listener net.Listener server *grpc.Server - app types.TMSPApplicationServer + app types.ABCIApplicationServer } -func NewGRPCServer(protoAddr string, app types.TMSPApplicationServer) (Service, error) { +func NewGRPCServer(protoAddr string, app types.ABCIApplicationServer) (Service, error) { parts := strings.SplitN(protoAddr, "://", 2) proto, addr := parts[0], parts[1] s := &GRPCServer{ @@ -32,7 +32,7 @@ func NewGRPCServer(protoAddr string, app types.TMSPApplicationServer) (Service, listener: nil, app: app, } - s.BaseService = *NewBaseService(nil, "TMSPServer", s) + s.BaseService = *NewBaseService(nil, "ABCIServer", s) _, err := s.Start() // Just start it return s, err } @@ -45,7 +45,7 @@ func (s *GRPCServer) OnStart() error { } s.listener = ln s.server = grpc.NewServer() - types.RegisterTMSPApplicationServer(s.server, s.app) + types.RegisterABCIApplicationServer(s.server, s.app) go s.server.Serve(s.listener) return nil } diff --git a/server/log.go b/server/log.go index 8ac4092e..4b313d25 100644 --- a/server/log.go +++ b/server/log.go @@ -4,4 +4,4 @@ import ( "github.com/tendermint/go-logger" ) -var log = logger.New("module", "tmsp-server") +var log = logger.New("module", "abci-server") diff --git a/server/server.go b/server/server.go index f2b9d0af..49676747 100644 --- a/server/server.go +++ b/server/server.go @@ -4,7 +4,7 @@ import ( "fmt" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) func NewServer(protoAddr, transport string, app types.Application) (Service, error) { diff --git a/server/socket_server.go b/server/socket_server.go index 5a916ef4..bd26a18a 100644 --- a/server/socket_server.go +++ b/server/socket_server.go @@ -9,7 +9,7 @@ import ( "sync" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) // var maxNumberConnections = 2 @@ -39,7 +39,7 @@ func NewSocketServer(protoAddr string, app types.Application) (Service, error) { app: app, conns: make(map[int]net.Conn), } - s.BaseService = *NewBaseService(nil, "TMSPServer", s) + s.BaseService = *NewBaseService(nil, "ABCIServer", s) _, err := s.Start() // Just start it return s, err } @@ -174,9 +174,9 @@ func (s *SocketServer) handleRequest(req *types.Request, responses chan<- *types so := r.SetOption logStr := s.app.SetOption(so.Key, so.Value) responses <- types.ToResponseSetOption(logStr) - case *types.Request_AppendTx: - res := s.app.AppendTx(r.AppendTx.Tx) - responses <- types.ToResponseAppendTx(res.Code, res.Data, res.Log) + case *types.Request_DeliverTx: + res := s.app.DeliverTx(r.DeliverTx.Tx) + responses <- types.ToResponseDeliverTx(res.Code, res.Data, res.Log) case *types.Request_CheckTx: res := s.app.CheckTx(r.CheckTx.Tx) responses <- types.ToResponseCheckTx(res.Code, res.Data, res.Log) diff --git a/tests/benchmarks/parallel/parallel.go b/tests/benchmarks/parallel/parallel.go index db57e19b..5960d529 100644 --- a/tests/benchmarks/parallel/parallel.go +++ b/tests/benchmarks/parallel/parallel.go @@ -6,7 +6,7 @@ import ( //"encoding/hex" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) func main() { diff --git a/tests/benchmarks/simple/simple.go b/tests/benchmarks/simple/simple.go index 585ebd2b..fb536730 100644 --- a/tests/benchmarks/simple/simple.go +++ b/tests/benchmarks/simple/simple.go @@ -9,7 +9,7 @@ import ( //"encoding/hex" . "github.com/tendermint/go-common" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) func main() { diff --git a/tests/test_app/app.go b/tests/test_app/app.go index 44e36eeb..59d5b0e7 100644 --- a/tests/test_app/app.go +++ b/tests/test_app/app.go @@ -7,24 +7,24 @@ import ( . "github.com/tendermint/go-common" "github.com/tendermint/go-process" - "github.com/tendermint/tmsp/client" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/client" + "github.com/tendermint/abci/types" ) //---------------------------------------- -func StartApp(tmspApp string) *process.Process { +func StartApp(abciApp string) *process.Process { // Start the app //outBuf := NewBufferCloser(nil) - proc, err := process.StartProcess("tmsp_app", + proc, err := process.StartProcess("abci_app", "", "bash", - []string{"-c", tmspApp}, + []string{"-c", abciApp}, nil, os.Stdout, ) if err != nil { - panic("running tmsp_app: " + err.Error()) + panic("running abci_app: " + err.Error()) } // TODO a better way to handle this? @@ -33,16 +33,16 @@ func StartApp(tmspApp string) *process.Process { return proc } -func StartClient(tmspType string) tmspcli.Client { +func StartClient(abciType string) abcicli.Client { // Start client - client, err := tmspcli.NewClient("tcp://127.0.0.1:46658", tmspType, true) + client, err := abcicli.NewClient("tcp://127.0.0.1:46658", abciType, true) if err != nil { - panic("connecting to tmsp_app: " + err.Error()) + panic("connecting to abci_app: " + err.Error()) } return client } -func SetOption(client tmspcli.Client, key, value string) { +func SetOption(client abcicli.Client, key, value string) { res := client.SetOptionSync(key, value) _, _, log := res.Code, res.Data, res.Log if res.IsErr() { @@ -50,7 +50,7 @@ func SetOption(client tmspcli.Client, key, value string) { } } -func Commit(client tmspcli.Client, hashExp []byte) { +func Commit(client abcicli.Client, hashExp []byte) { res := client.CommitSync() _, data, log := res.Code, res.Data, res.Log if res.IsErr() { @@ -62,20 +62,20 @@ func Commit(client tmspcli.Client, hashExp []byte) { } } -func AppendTx(client tmspcli.Client, txBytes []byte, codeExp types.CodeType, dataExp []byte) { - res := client.AppendTxSync(txBytes) +func DeliverTx(client abcicli.Client, txBytes []byte, codeExp types.CodeType, dataExp []byte) { + res := client.DeliverTxSync(txBytes) code, data, log := res.Code, res.Data, res.Log if code != codeExp { - panic(Fmt("AppendTx response code was unexpected. Got %v expected %v. Log: %v", + panic(Fmt("DeliverTx response code was unexpected. Got %v expected %v. Log: %v", code, codeExp, log)) } if !bytes.Equal(data, dataExp) { - panic(Fmt("AppendTx response data was unexpected. Got %X expected %X", + panic(Fmt("DeliverTx response data was unexpected. Got %X expected %X", data, dataExp)) } } -func CheckTx(client tmspcli.Client, txBytes []byte, codeExp types.CodeType, dataExp []byte) { +func CheckTx(client abcicli.Client, txBytes []byte, codeExp types.CodeType, dataExp []byte) { res := client.CheckTxSync(txBytes) code, data, log := res.Code, res.Data, res.Log if res.IsErr() { diff --git a/tests/test_app/main.go b/tests/test_app/main.go index ada63718..05f66b07 100644 --- a/tests/test_app/main.go +++ b/tests/test_app/main.go @@ -4,15 +4,15 @@ import ( "fmt" "os" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) -var tmspType string +var abciType string func init() { - tmspType = os.Getenv("TMSP") - if tmspType == "" { - tmspType = "socket" + abciType = os.Getenv("ABCI") + if abciType == "" { + abciType = "socket" } } @@ -21,28 +21,28 @@ func main() { } func testCounter() { - tmspApp := os.Getenv("TMSP_APP") - if tmspApp == "" { - panic("No TMSP_APP specified") + abciApp := os.Getenv("ABCI_APP") + if abciApp == "" { + panic("No ABCI_APP specified") } - fmt.Printf("Running %s test with tmsp=%s\n", tmspApp, tmspType) - appProc := StartApp(tmspApp) + fmt.Printf("Running %s test with abci=%s\n", abciApp, abciType) + appProc := StartApp(abciApp) defer appProc.StopProcess(true) - client := StartClient(tmspType) + client := StartClient(abciType) defer client.Stop() SetOption(client, "serial", "on") Commit(client, nil) - AppendTx(client, []byte("abc"), types.CodeType_BadNonce, nil) + DeliverTx(client, []byte("abc"), types.CodeType_BadNonce, nil) Commit(client, nil) - AppendTx(client, []byte{0x00}, types.CodeType_OK, nil) + DeliverTx(client, []byte{0x00}, types.CodeType_OK, nil) Commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 1}) - AppendTx(client, []byte{0x00}, types.CodeType_BadNonce, nil) - AppendTx(client, []byte{0x01}, types.CodeType_OK, nil) - AppendTx(client, []byte{0x00, 0x02}, types.CodeType_OK, nil) - AppendTx(client, []byte{0x00, 0x03}, types.CodeType_OK, nil) - AppendTx(client, []byte{0x00, 0x00, 0x04}, types.CodeType_OK, nil) - AppendTx(client, []byte{0x00, 0x00, 0x06}, types.CodeType_BadNonce, nil) + DeliverTx(client, []byte{0x00}, types.CodeType_BadNonce, nil) + DeliverTx(client, []byte{0x01}, types.CodeType_OK, nil) + DeliverTx(client, []byte{0x00, 0x02}, types.CodeType_OK, nil) + DeliverTx(client, []byte{0x00, 0x03}, types.CodeType_OK, nil) + DeliverTx(client, []byte{0x00, 0x00, 0x04}, types.CodeType_OK, nil) + DeliverTx(client, []byte{0x00, 0x00, 0x06}, types.CodeType_BadNonce, nil) Commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 5}) } diff --git a/tests/test_app/test.sh b/tests/test_app/test.sh index 4c28a831..a0f2c3ce 100755 --- a/tests/test_app/test.sh +++ b/tests/test_app/test.sh @@ -1,17 +1,17 @@ #! /bin/bash set -e -# These tests spawn the counter app and server by execing the TMSP_APP command and run some simple client tests against it +# These tests spawn the counter app and server by execing the ABCI_APP command and run some simple client tests against it -ROOT=$GOPATH/src/github.com/tendermint/tmsp/tests/test_app +ROOT=$GOPATH/src/github.com/tendermint/abci/tests/test_app cd $ROOT # test golang counter -TMSP_APP="counter" go run *.go +ABCI_APP="counter" go run *.go # test golang counter via grpc -TMSP_APP="counter -tmsp=grpc" TMSP="grpc" go run *.go +ABCI_APP="counter -abci=grpc" ABCI="grpc" go run *.go # test nodejs counter # TODO: fix node app -#TMSP_APP="node $GOPATH/src/github.com/tendermint/js-tmsp/example/app.js" go test -test.run TestCounter +#ABCI_APP="node $GOPATH/src/github.com/tendermint/js-abci/example/app.js" go test -test.run TestCounter diff --git a/tests/test_cli/ex1.tmsp b/tests/test_cli/ex1.abci similarity index 63% rename from tests/test_cli/ex1.tmsp rename to tests/test_cli/ex1.abci index 13251267..e909266e 100644 --- a/tests/test_cli/ex1.tmsp +++ b/tests/test_cli/ex1.abci @@ -1,10 +1,10 @@ echo hello info commit -append_tx "abc" +deliver_tx "abc" info commit query "abc" -append_tx "def=xyz" +deliver_tx "def=xyz" commit query "def" diff --git a/tests/test_cli/ex1.tmsp.out b/tests/test_cli/ex1.abci.out similarity index 91% rename from tests/test_cli/ex1.tmsp.out rename to tests/test_cli/ex1.abci.out index 51cee99f..c8739758 100644 --- a/tests/test_cli/ex1.tmsp.out +++ b/tests/test_cli/ex1.abci.out @@ -7,7 +7,7 @@ > commit -> data: 0x -> append_tx "abc" +> deliver_tx "abc" -> code: OK > info @@ -20,7 +20,7 @@ -> code: OK -> data: {"index":0,"value":"abc","valueHex":"616263","exists":true} -> append_tx "def=xyz" +> deliver_tx "def=xyz" -> code: OK > commit diff --git a/tests/test_cli/ex2.tmsp b/tests/test_cli/ex2.abci similarity index 58% rename from tests/test_cli/ex2.tmsp rename to tests/test_cli/ex2.abci index e9550db8..3b435f22 100644 --- a/tests/test_cli/ex2.tmsp +++ b/tests/test_cli/ex2.abci @@ -1,8 +1,8 @@ set_option serial on check_tx 0x00 check_tx 0xff -append_tx 0x00 +deliver_tx 0x00 check_tx 0x00 -append_tx 0x01 -append_tx 0x04 +deliver_tx 0x01 +deliver_tx 0x04 info diff --git a/tests/test_cli/ex2.tmsp.out b/tests/test_cli/ex2.abci.out similarity index 84% rename from tests/test_cli/ex2.tmsp.out rename to tests/test_cli/ex2.abci.out index 84e4ad4f..1fab1e84 100644 --- a/tests/test_cli/ex2.tmsp.out +++ b/tests/test_cli/ex2.abci.out @@ -7,17 +7,17 @@ > check_tx 0xff -> code: OK -> append_tx 0x00 +> deliver_tx 0x00 -> code: OK > check_tx 0x00 -> code: BadNonce -> log: Invalid nonce. Expected >= 1, got 0 -> append_tx 0x01 +> deliver_tx 0x01 -> code: OK -> append_tx 0x04 +> deliver_tx 0x04 -> code: BadNonce -> log: Invalid nonce. Expected 2, got 4 diff --git a/tests/test_cli/test.sh b/tests/test_cli/test.sh index 00446c45..a770730b 100644 --- a/tests/test_cli/test.sh +++ b/tests/test_cli/test.sh @@ -1,5 +1,7 @@ #! /bin/bash +cd $GOPATH/src/github.com/tendermint/abci + function testExample() { N=$1 INPUT=$2 @@ -8,7 +10,7 @@ function testExample() { echo "Example $N" $APP &> /dev/null & sleep 2 - tmsp-cli --verbose batch < $INPUT > "${INPUT}.out.new" + abci-cli --verbose batch < $INPUT > "${INPUT}.out.new" killall "$APP" pre=`shasum < "${INPUT}.out"` @@ -26,8 +28,8 @@ function testExample() { rm "${INPUT}".out.new } -testExample 1 tests/test_cli/ex1.tmsp dummy -testExample 2 tests/test_cli/ex2.tmsp counter +testExample 1 tests/test_cli/ex1.abci dummy +testExample 2 tests/test_cli/ex2.abci counter echo "" echo "PASS" diff --git a/testutil/messages.go b/testutil/messages.go index 2890fbd5..1036e48e 100644 --- a/testutil/messages.go +++ b/testutil/messages.go @@ -2,7 +2,7 @@ package testutil import ( "github.com/tendermint/go-crypto" - "github.com/tendermint/tmsp/types" + "github.com/tendermint/abci/types" ) //---------------------------------------- diff --git a/types/application.go b/types/application.go index 59b619e8..4da5e6f7 100644 --- a/types/application.go +++ b/types/application.go @@ -13,8 +13,8 @@ type Application interface { // Set application option (e.g. mode=mempool, mode=consensus) SetOption(key string, value string) (log string) - // Append a tx - AppendTx(tx []byte) Result + // Deliver a tx + DeliverTx(tx []byte) Result // Validate a tx for the mempool CheckTx(tx []byte) Result @@ -67,9 +67,9 @@ func (app *GRPCApplication) SetOption(ctx context.Context, req *RequestSetOption return &ResponseSetOption{app.app.SetOption(req.Key, req.Value)}, nil } -func (app *GRPCApplication) AppendTx(ctx context.Context, req *RequestAppendTx) (*ResponseAppendTx, error) { - r := app.app.AppendTx(req.Tx) - return &ResponseAppendTx{r.Code, r.Data, r.Log}, nil +func (app *GRPCApplication) DeliverTx(ctx context.Context, req *RequestDeliverTx) (*ResponseDeliverTx, error) { + r := app.app.DeliverTx(req.Tx) + return &ResponseDeliverTx{r.Code, r.Data, r.Log}, nil } func (app *GRPCApplication) CheckTx(ctx context.Context, req *RequestCheckTx) (*ResponseCheckTx, error) { diff --git a/types/messages.go b/types/messages.go index 2d256d8c..84e6ee0b 100644 --- a/types/messages.go +++ b/types/messages.go @@ -31,9 +31,9 @@ func ToRequestSetOption(key string, value string) *Request { } } -func ToRequestAppendTx(txBytes []byte) *Request { +func ToRequestDeliverTx(txBytes []byte) *Request { return &Request{ - Value: &Request_AppendTx{&RequestAppendTx{txBytes}}, + Value: &Request_DeliverTx{&RequestDeliverTx{txBytes}}, } } @@ -105,9 +105,9 @@ func ToResponseSetOption(log string) *Response { } } -func ToResponseAppendTx(code CodeType, data []byte, log string) *Response { +func ToResponseDeliverTx(code CodeType, data []byte, log string) *Response { return &Response{ - Value: &Response_AppendTx{&ResponseAppendTx{code, data, log}}, + Value: &Response_DeliverTx{&ResponseDeliverTx{code, data, log}}, } } diff --git a/types/result.go b/types/result.go index 717ae2fa..571c5bf8 100644 --- a/types/result.go +++ b/types/result.go @@ -28,7 +28,7 @@ func (res Result) IsErr() bool { } func (res Result) Error() string { - return fmt.Sprintf("TMSP code:%v, data:%X, log:%v", res.Code, res.Data, res.Log) + return fmt.Sprintf("ABCI code:%v, data:%X, log:%v", res.Code, res.Data, res.Log) } func (res Result) PrependLog(log string) Result { diff --git a/types/types.pb.go b/types/types.pb.go index c9781779..40c3441b 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -14,7 +14,7 @@ It has these top-level messages: RequestFlush RequestInfo RequestSetOption - RequestAppendTx + RequestDeliverTx RequestCheckTx RequestQuery RequestCommit @@ -27,7 +27,7 @@ It has these top-level messages: ResponseFlush ResponseInfo ResponseSetOption - ResponseAppendTx + ResponseDeliverTx ResponseCheckTx ResponseQuery ResponseCommit @@ -74,7 +74,7 @@ const ( MessageType_Info MessageType = 3 MessageType_SetOption MessageType = 4 MessageType_Exception MessageType = 5 - MessageType_AppendTx MessageType = 17 + MessageType_DeliverTx MessageType = 17 MessageType_CheckTx MessageType = 18 MessageType_Commit MessageType = 19 MessageType_Query MessageType = 20 @@ -90,7 +90,7 @@ var MessageType_name = map[int32]string{ 3: "Info", 4: "SetOption", 5: "Exception", - 17: "AppendTx", + 17: "DeliverTx", 18: "CheckTx", 19: "Commit", 20: "Query", @@ -105,7 +105,7 @@ var MessageType_value = map[string]int32{ "Info": 3, "SetOption": 4, "Exception": 5, - "AppendTx": 17, + "DeliverTx": 17, "CheckTx": 18, "Commit": 19, "Query": 20, @@ -233,7 +233,7 @@ type Request struct { // *Request_Flush // *Request_Info // *Request_SetOption - // *Request_AppendTx + // *Request_DeliverTx // *Request_CheckTx // *Request_Commit // *Request_Query @@ -264,8 +264,8 @@ type Request_Info struct { type Request_SetOption struct { SetOption *RequestSetOption `protobuf:"bytes,4,opt,name=set_option,json=setOption,oneof"` } -type Request_AppendTx struct { - AppendTx *RequestAppendTx `protobuf:"bytes,5,opt,name=append_tx,json=appendTx,oneof"` +type Request_DeliverTx struct { + DeliverTx *RequestDeliverTx `protobuf:"bytes,5,opt,name=deliver_tx,json=deliverTx,oneof"` } type Request_CheckTx struct { CheckTx *RequestCheckTx `protobuf:"bytes,6,opt,name=check_tx,json=checkTx,oneof"` @@ -290,7 +290,7 @@ func (*Request_Echo) isRequest_Value() {} func (*Request_Flush) isRequest_Value() {} func (*Request_Info) isRequest_Value() {} func (*Request_SetOption) isRequest_Value() {} -func (*Request_AppendTx) isRequest_Value() {} +func (*Request_DeliverTx) isRequest_Value() {} func (*Request_CheckTx) isRequest_Value() {} func (*Request_Commit) isRequest_Value() {} func (*Request_Query) isRequest_Value() {} @@ -333,9 +333,9 @@ func (m *Request) GetSetOption() *RequestSetOption { return nil } -func (m *Request) GetAppendTx() *RequestAppendTx { - if x, ok := m.GetValue().(*Request_AppendTx); ok { - return x.AppendTx +func (m *Request) GetDeliverTx() *RequestDeliverTx { + if x, ok := m.GetValue().(*Request_DeliverTx); ok { + return x.DeliverTx } return nil } @@ -389,7 +389,7 @@ func (*Request) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error (*Request_Flush)(nil), (*Request_Info)(nil), (*Request_SetOption)(nil), - (*Request_AppendTx)(nil), + (*Request_DeliverTx)(nil), (*Request_CheckTx)(nil), (*Request_Commit)(nil), (*Request_Query)(nil), @@ -423,9 +423,9 @@ func _Request_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { if err := b.EncodeMessage(x.SetOption); err != nil { return err } - case *Request_AppendTx: + case *Request_DeliverTx: b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.AppendTx); err != nil { + if err := b.EncodeMessage(x.DeliverTx); err != nil { return err } case *Request_CheckTx: @@ -500,13 +500,13 @@ func _Request_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer err := b.DecodeMessage(msg) m.Value = &Request_SetOption{msg} return true, err - case 5: // value.append_tx + case 5: // value.deliver_tx if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(RequestAppendTx) + msg := new(RequestDeliverTx) err := b.DecodeMessage(msg) - m.Value = &Request_AppendTx{msg} + m.Value = &Request_DeliverTx{msg} return true, err case 6: // value.check_tx if wire != proto.WireBytes { @@ -585,8 +585,8 @@ func _Request_OneofSizer(msg proto.Message) (n int) { n += proto.SizeVarint(4<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Request_AppendTx: - s := proto.Size(x.AppendTx) + case *Request_DeliverTx: + s := proto.Size(x.DeliverTx) n += proto.SizeVarint(5<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s @@ -683,16 +683,16 @@ func (m *RequestSetOption) GetValue() string { return "" } -type RequestAppendTx struct { +type RequestDeliverTx struct { Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` } -func (m *RequestAppendTx) Reset() { *m = RequestAppendTx{} } -func (m *RequestAppendTx) String() string { return proto.CompactTextString(m) } -func (*RequestAppendTx) ProtoMessage() {} -func (*RequestAppendTx) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } +func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } +func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } +func (*RequestDeliverTx) ProtoMessage() {} +func (*RequestDeliverTx) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } -func (m *RequestAppendTx) GetTx() []byte { +func (m *RequestDeliverTx) GetTx() []byte { if m != nil { return m.Tx } @@ -802,7 +802,7 @@ type Response struct { // *Response_Flush // *Response_Info // *Response_SetOption - // *Response_AppendTx + // *Response_DeliverTx // *Response_CheckTx // *Response_Commit // *Response_Query @@ -836,8 +836,8 @@ type Response_Info struct { type Response_SetOption struct { SetOption *ResponseSetOption `protobuf:"bytes,5,opt,name=set_option,json=setOption,oneof"` } -type Response_AppendTx struct { - AppendTx *ResponseAppendTx `protobuf:"bytes,6,opt,name=append_tx,json=appendTx,oneof"` +type Response_DeliverTx struct { + DeliverTx *ResponseDeliverTx `protobuf:"bytes,6,opt,name=deliver_tx,json=deliverTx,oneof"` } type Response_CheckTx struct { CheckTx *ResponseCheckTx `protobuf:"bytes,7,opt,name=check_tx,json=checkTx,oneof"` @@ -863,7 +863,7 @@ func (*Response_Echo) isResponse_Value() {} func (*Response_Flush) isResponse_Value() {} func (*Response_Info) isResponse_Value() {} func (*Response_SetOption) isResponse_Value() {} -func (*Response_AppendTx) isResponse_Value() {} +func (*Response_DeliverTx) isResponse_Value() {} func (*Response_CheckTx) isResponse_Value() {} func (*Response_Commit) isResponse_Value() {} func (*Response_Query) isResponse_Value() {} @@ -913,9 +913,9 @@ func (m *Response) GetSetOption() *ResponseSetOption { return nil } -func (m *Response) GetAppendTx() *ResponseAppendTx { - if x, ok := m.GetValue().(*Response_AppendTx); ok { - return x.AppendTx +func (m *Response) GetDeliverTx() *ResponseDeliverTx { + if x, ok := m.GetValue().(*Response_DeliverTx); ok { + return x.DeliverTx } return nil } @@ -970,7 +970,7 @@ func (*Response) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) erro (*Response_Flush)(nil), (*Response_Info)(nil), (*Response_SetOption)(nil), - (*Response_AppendTx)(nil), + (*Response_DeliverTx)(nil), (*Response_CheckTx)(nil), (*Response_Commit)(nil), (*Response_Query)(nil), @@ -1009,9 +1009,9 @@ func _Response_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { if err := b.EncodeMessage(x.SetOption); err != nil { return err } - case *Response_AppendTx: + case *Response_DeliverTx: b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.AppendTx); err != nil { + if err := b.EncodeMessage(x.DeliverTx); err != nil { return err } case *Response_CheckTx: @@ -1094,13 +1094,13 @@ func _Response_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffe err := b.DecodeMessage(msg) m.Value = &Response_SetOption{msg} return true, err - case 6: // value.append_tx + case 6: // value.deliver_tx if wire != proto.WireBytes { return true, proto.ErrInternalBadWireType } - msg := new(ResponseAppendTx) + msg := new(ResponseDeliverTx) err := b.DecodeMessage(msg) - m.Value = &Response_AppendTx{msg} + m.Value = &Response_DeliverTx{msg} return true, err case 7: // value.check_tx if wire != proto.WireBytes { @@ -1184,8 +1184,8 @@ func _Response_OneofSizer(msg proto.Message) (n int) { n += proto.SizeVarint(5<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s - case *Response_AppendTx: - s := proto.Size(x.AppendTx) + case *Response_DeliverTx: + s := proto.Size(x.DeliverTx) n += proto.SizeVarint(6<<3 | proto.WireBytes) n += proto.SizeVarint(uint64(s)) n += s @@ -1322,32 +1322,32 @@ func (m *ResponseSetOption) GetLog() string { return "" } -type ResponseAppendTx struct { +type ResponseDeliverTx struct { Code CodeType `protobuf:"varint,1,opt,name=code,enum=types.CodeType" json:"code,omitempty"` Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` Log string `protobuf:"bytes,3,opt,name=log" json:"log,omitempty"` } -func (m *ResponseAppendTx) Reset() { *m = ResponseAppendTx{} } -func (m *ResponseAppendTx) String() string { return proto.CompactTextString(m) } -func (*ResponseAppendTx) ProtoMessage() {} -func (*ResponseAppendTx) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} } +func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } +func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } +func (*ResponseDeliverTx) ProtoMessage() {} +func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} } -func (m *ResponseAppendTx) GetCode() CodeType { +func (m *ResponseDeliverTx) GetCode() CodeType { if m != nil { return m.Code } return CodeType_OK } -func (m *ResponseAppendTx) GetData() []byte { +func (m *ResponseDeliverTx) GetData() []byte { if m != nil { return m.Data } return nil } -func (m *ResponseAppendTx) GetLog() string { +func (m *ResponseDeliverTx) GetLog() string { if m != nil { return m.Log } @@ -1640,7 +1640,7 @@ func init() { proto.RegisterType((*RequestFlush)(nil), "types.RequestFlush") proto.RegisterType((*RequestInfo)(nil), "types.RequestInfo") proto.RegisterType((*RequestSetOption)(nil), "types.RequestSetOption") - proto.RegisterType((*RequestAppendTx)(nil), "types.RequestAppendTx") + proto.RegisterType((*RequestDeliverTx)(nil), "types.RequestDeliverTx") proto.RegisterType((*RequestCheckTx)(nil), "types.RequestCheckTx") proto.RegisterType((*RequestQuery)(nil), "types.RequestQuery") proto.RegisterType((*RequestCommit)(nil), "types.RequestCommit") @@ -1653,7 +1653,7 @@ func init() { proto.RegisterType((*ResponseFlush)(nil), "types.ResponseFlush") proto.RegisterType((*ResponseInfo)(nil), "types.ResponseInfo") proto.RegisterType((*ResponseSetOption)(nil), "types.ResponseSetOption") - proto.RegisterType((*ResponseAppendTx)(nil), "types.ResponseAppendTx") + proto.RegisterType((*ResponseDeliverTx)(nil), "types.ResponseDeliverTx") proto.RegisterType((*ResponseCheckTx)(nil), "types.ResponseCheckTx") proto.RegisterType((*ResponseQuery)(nil), "types.ResponseQuery") proto.RegisterType((*ResponseCommit)(nil), "types.ResponseCommit") @@ -1676,14 +1676,14 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// Client API for TMSPApplication service +// Client API for ABCIApplication service -type TMSPApplicationClient interface { +type ABCIApplicationClient interface { Echo(ctx context.Context, in *RequestEcho, opts ...grpc.CallOption) (*ResponseEcho, error) Flush(ctx context.Context, in *RequestFlush, opts ...grpc.CallOption) (*ResponseFlush, error) Info(ctx context.Context, in *RequestInfo, opts ...grpc.CallOption) (*ResponseInfo, error) SetOption(ctx context.Context, in *RequestSetOption, opts ...grpc.CallOption) (*ResponseSetOption, error) - AppendTx(ctx context.Context, in *RequestAppendTx, opts ...grpc.CallOption) (*ResponseAppendTx, error) + DeliverTx(ctx context.Context, in *RequestDeliverTx, opts ...grpc.CallOption) (*ResponseDeliverTx, error) CheckTx(ctx context.Context, in *RequestCheckTx, opts ...grpc.CallOption) (*ResponseCheckTx, error) Query(ctx context.Context, in *RequestQuery, opts ...grpc.CallOption) (*ResponseQuery, error) Commit(ctx context.Context, in *RequestCommit, opts ...grpc.CallOption) (*ResponseCommit, error) @@ -1696,13 +1696,13 @@ type tMSPApplicationClient struct { cc *grpc.ClientConn } -func NewTMSPApplicationClient(cc *grpc.ClientConn) TMSPApplicationClient { +func NewABCIApplicationClient(cc *grpc.ClientConn) ABCIApplicationClient { return &tMSPApplicationClient{cc} } func (c *tMSPApplicationClient) Echo(ctx context.Context, in *RequestEcho, opts ...grpc.CallOption) (*ResponseEcho, error) { out := new(ResponseEcho) - err := grpc.Invoke(ctx, "/types.TMSPApplication/Echo", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/Echo", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1711,7 +1711,7 @@ func (c *tMSPApplicationClient) Echo(ctx context.Context, in *RequestEcho, opts func (c *tMSPApplicationClient) Flush(ctx context.Context, in *RequestFlush, opts ...grpc.CallOption) (*ResponseFlush, error) { out := new(ResponseFlush) - err := grpc.Invoke(ctx, "/types.TMSPApplication/Flush", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/Flush", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1720,7 +1720,7 @@ func (c *tMSPApplicationClient) Flush(ctx context.Context, in *RequestFlush, opt func (c *tMSPApplicationClient) Info(ctx context.Context, in *RequestInfo, opts ...grpc.CallOption) (*ResponseInfo, error) { out := new(ResponseInfo) - err := grpc.Invoke(ctx, "/types.TMSPApplication/Info", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/Info", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1729,16 +1729,16 @@ func (c *tMSPApplicationClient) Info(ctx context.Context, in *RequestInfo, opts func (c *tMSPApplicationClient) SetOption(ctx context.Context, in *RequestSetOption, opts ...grpc.CallOption) (*ResponseSetOption, error) { out := new(ResponseSetOption) - err := grpc.Invoke(ctx, "/types.TMSPApplication/SetOption", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/SetOption", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -func (c *tMSPApplicationClient) AppendTx(ctx context.Context, in *RequestAppendTx, opts ...grpc.CallOption) (*ResponseAppendTx, error) { - out := new(ResponseAppendTx) - err := grpc.Invoke(ctx, "/types.TMSPApplication/AppendTx", in, out, c.cc, opts...) +func (c *tMSPApplicationClient) DeliverTx(ctx context.Context, in *RequestDeliverTx, opts ...grpc.CallOption) (*ResponseDeliverTx, error) { + out := new(ResponseDeliverTx) + err := grpc.Invoke(ctx, "/types.ABCIApplication/DeliverTx", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1747,7 +1747,7 @@ func (c *tMSPApplicationClient) AppendTx(ctx context.Context, in *RequestAppendT func (c *tMSPApplicationClient) CheckTx(ctx context.Context, in *RequestCheckTx, opts ...grpc.CallOption) (*ResponseCheckTx, error) { out := new(ResponseCheckTx) - err := grpc.Invoke(ctx, "/types.TMSPApplication/CheckTx", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/CheckTx", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1756,7 +1756,7 @@ func (c *tMSPApplicationClient) CheckTx(ctx context.Context, in *RequestCheckTx, func (c *tMSPApplicationClient) Query(ctx context.Context, in *RequestQuery, opts ...grpc.CallOption) (*ResponseQuery, error) { out := new(ResponseQuery) - err := grpc.Invoke(ctx, "/types.TMSPApplication/Query", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/Query", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1765,7 +1765,7 @@ func (c *tMSPApplicationClient) Query(ctx context.Context, in *RequestQuery, opt func (c *tMSPApplicationClient) Commit(ctx context.Context, in *RequestCommit, opts ...grpc.CallOption) (*ResponseCommit, error) { out := new(ResponseCommit) - err := grpc.Invoke(ctx, "/types.TMSPApplication/Commit", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/Commit", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1774,7 +1774,7 @@ func (c *tMSPApplicationClient) Commit(ctx context.Context, in *RequestCommit, o func (c *tMSPApplicationClient) InitChain(ctx context.Context, in *RequestInitChain, opts ...grpc.CallOption) (*ResponseInitChain, error) { out := new(ResponseInitChain) - err := grpc.Invoke(ctx, "/types.TMSPApplication/InitChain", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/InitChain", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1783,7 +1783,7 @@ func (c *tMSPApplicationClient) InitChain(ctx context.Context, in *RequestInitCh func (c *tMSPApplicationClient) BeginBlock(ctx context.Context, in *RequestBeginBlock, opts ...grpc.CallOption) (*ResponseBeginBlock, error) { out := new(ResponseBeginBlock) - err := grpc.Invoke(ctx, "/types.TMSPApplication/BeginBlock", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/BeginBlock", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1792,21 +1792,21 @@ func (c *tMSPApplicationClient) BeginBlock(ctx context.Context, in *RequestBegin func (c *tMSPApplicationClient) EndBlock(ctx context.Context, in *RequestEndBlock, opts ...grpc.CallOption) (*ResponseEndBlock, error) { out := new(ResponseEndBlock) - err := grpc.Invoke(ctx, "/types.TMSPApplication/EndBlock", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/types.ABCIApplication/EndBlock", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -// Server API for TMSPApplication service +// Server API for ABCIApplication service -type TMSPApplicationServer interface { +type ABCIApplicationServer interface { Echo(context.Context, *RequestEcho) (*ResponseEcho, error) Flush(context.Context, *RequestFlush) (*ResponseFlush, error) Info(context.Context, *RequestInfo) (*ResponseInfo, error) SetOption(context.Context, *RequestSetOption) (*ResponseSetOption, error) - AppendTx(context.Context, *RequestAppendTx) (*ResponseAppendTx, error) + DeliverTx(context.Context, *RequestDeliverTx) (*ResponseDeliverTx, error) CheckTx(context.Context, *RequestCheckTx) (*ResponseCheckTx, error) Query(context.Context, *RequestQuery) (*ResponseQuery, error) Commit(context.Context, *RequestCommit) (*ResponseCommit, error) @@ -1815,255 +1815,255 @@ type TMSPApplicationServer interface { EndBlock(context.Context, *RequestEndBlock) (*ResponseEndBlock, error) } -func RegisterTMSPApplicationServer(s *grpc.Server, srv TMSPApplicationServer) { - s.RegisterService(&_TMSPApplication_serviceDesc, srv) +func RegisterABCIApplicationServer(s *grpc.Server, srv ABCIApplicationServer) { + s.RegisterService(&_ABCIApplication_serviceDesc, srv) } -func _TMSPApplication_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestEcho) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).Echo(ctx, in) + return srv.(ABCIApplicationServer).Echo(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/Echo", + FullMethod: "/types.ABCIApplication/Echo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).Echo(ctx, req.(*RequestEcho)) + return srv.(ABCIApplicationServer).Echo(ctx, req.(*RequestEcho)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_Flush_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_Flush_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestFlush) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).Flush(ctx, in) + return srv.(ABCIApplicationServer).Flush(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/Flush", + FullMethod: "/types.ABCIApplication/Flush", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).Flush(ctx, req.(*RequestFlush)) + return srv.(ABCIApplicationServer).Flush(ctx, req.(*RequestFlush)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_Info_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_Info_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestInfo) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).Info(ctx, in) + return srv.(ABCIApplicationServer).Info(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/Info", + FullMethod: "/types.ABCIApplication/Info", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).Info(ctx, req.(*RequestInfo)) + return srv.(ABCIApplicationServer).Info(ctx, req.(*RequestInfo)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_SetOption_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_SetOption_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestSetOption) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).SetOption(ctx, in) + return srv.(ABCIApplicationServer).SetOption(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/SetOption", + FullMethod: "/types.ABCIApplication/SetOption", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).SetOption(ctx, req.(*RequestSetOption)) + return srv.(ABCIApplicationServer).SetOption(ctx, req.(*RequestSetOption)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_AppendTx_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(RequestAppendTx) +func _ABCIApplication_DeliverTx_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RequestDeliverTx) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).AppendTx(ctx, in) + return srv.(ABCIApplicationServer).DeliverTx(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/AppendTx", + FullMethod: "/types.ABCIApplication/DeliverTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).AppendTx(ctx, req.(*RequestAppendTx)) + return srv.(ABCIApplicationServer).DeliverTx(ctx, req.(*RequestDeliverTx)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_CheckTx_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_CheckTx_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestCheckTx) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).CheckTx(ctx, in) + return srv.(ABCIApplicationServer).CheckTx(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/CheckTx", + FullMethod: "/types.ABCIApplication/CheckTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).CheckTx(ctx, req.(*RequestCheckTx)) + return srv.(ABCIApplicationServer).CheckTx(ctx, req.(*RequestCheckTx)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_Query_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_Query_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestQuery) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).Query(ctx, in) + return srv.(ABCIApplicationServer).Query(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/Query", + FullMethod: "/types.ABCIApplication/Query", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).Query(ctx, req.(*RequestQuery)) + return srv.(ABCIApplicationServer).Query(ctx, req.(*RequestQuery)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_Commit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_Commit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestCommit) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).Commit(ctx, in) + return srv.(ABCIApplicationServer).Commit(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/Commit", + FullMethod: "/types.ABCIApplication/Commit", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).Commit(ctx, req.(*RequestCommit)) + return srv.(ABCIApplicationServer).Commit(ctx, req.(*RequestCommit)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_InitChain_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_InitChain_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestInitChain) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).InitChain(ctx, in) + return srv.(ABCIApplicationServer).InitChain(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/InitChain", + FullMethod: "/types.ABCIApplication/InitChain", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).InitChain(ctx, req.(*RequestInitChain)) + return srv.(ABCIApplicationServer).InitChain(ctx, req.(*RequestInitChain)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_BeginBlock_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_BeginBlock_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestBeginBlock) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).BeginBlock(ctx, in) + return srv.(ABCIApplicationServer).BeginBlock(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/BeginBlock", + FullMethod: "/types.ABCIApplication/BeginBlock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).BeginBlock(ctx, req.(*RequestBeginBlock)) + return srv.(ABCIApplicationServer).BeginBlock(ctx, req.(*RequestBeginBlock)) } return interceptor(ctx, in, info, handler) } -func _TMSPApplication_EndBlock_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ABCIApplication_EndBlock_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestEndBlock) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TMSPApplicationServer).EndBlock(ctx, in) + return srv.(ABCIApplicationServer).EndBlock(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/types.TMSPApplication/EndBlock", + FullMethod: "/types.ABCIApplication/EndBlock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TMSPApplicationServer).EndBlock(ctx, req.(*RequestEndBlock)) + return srv.(ABCIApplicationServer).EndBlock(ctx, req.(*RequestEndBlock)) } return interceptor(ctx, in, info, handler) } -var _TMSPApplication_serviceDesc = grpc.ServiceDesc{ - ServiceName: "types.TMSPApplication", - HandlerType: (*TMSPApplicationServer)(nil), +var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ + ServiceName: "types.ABCIApplication", + HandlerType: (*ABCIApplicationServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "Echo", - Handler: _TMSPApplication_Echo_Handler, + Handler: _ABCIApplication_Echo_Handler, }, { MethodName: "Flush", - Handler: _TMSPApplication_Flush_Handler, + Handler: _ABCIApplication_Flush_Handler, }, { MethodName: "Info", - Handler: _TMSPApplication_Info_Handler, + Handler: _ABCIApplication_Info_Handler, }, { MethodName: "SetOption", - Handler: _TMSPApplication_SetOption_Handler, + Handler: _ABCIApplication_SetOption_Handler, }, { - MethodName: "AppendTx", - Handler: _TMSPApplication_AppendTx_Handler, + MethodName: "DeliverTx", + Handler: _ABCIApplication_DeliverTx_Handler, }, { MethodName: "CheckTx", - Handler: _TMSPApplication_CheckTx_Handler, + Handler: _ABCIApplication_CheckTx_Handler, }, { MethodName: "Query", - Handler: _TMSPApplication_Query_Handler, + Handler: _ABCIApplication_Query_Handler, }, { MethodName: "Commit", - Handler: _TMSPApplication_Commit_Handler, + Handler: _ABCIApplication_Commit_Handler, }, { MethodName: "InitChain", - Handler: _TMSPApplication_InitChain_Handler, + Handler: _ABCIApplication_InitChain_Handler, }, { MethodName: "BeginBlock", - Handler: _TMSPApplication_BeginBlock_Handler, + Handler: _ABCIApplication_BeginBlock_Handler, }, { MethodName: "EndBlock", - Handler: _TMSPApplication_EndBlock_Handler, + Handler: _ABCIApplication_EndBlock_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/types/types.proto b/types/types.proto index 69f9a573..b3ff1655 100644 --- a/types/types.proto +++ b/types/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package types; -// This file is copied from http://github.com/tendermint/tmsp +// This file is copied from http://github.com/tendermint/abci //---------------------------------------- // Message types @@ -18,7 +18,7 @@ enum MessageType { Info = 0x03; SetOption = 0x04; Exception = 0x05; - AppendTx = 0x11; + DeliverTx = 0x11; CheckTx = 0x12; Commit = 0x13; Query = 0x14; @@ -79,7 +79,7 @@ message Request { RequestFlush flush = 2; RequestInfo info = 3; RequestSetOption set_option = 4; - RequestAppendTx append_tx = 5; + RequestDeliverTx deliver_tx = 5; RequestCheckTx check_tx = 6; RequestCommit commit = 7; RequestQuery query = 8; @@ -104,7 +104,7 @@ message RequestSetOption{ string value = 2; } -message RequestAppendTx{ +message RequestDeliverTx{ bytes tx = 1; } @@ -143,7 +143,7 @@ message Response { ResponseFlush flush = 3; ResponseInfo info = 4; ResponseSetOption set_option = 5; - ResponseAppendTx append_tx = 6; + ResponseDeliverTx deliver_tx = 6; ResponseCheckTx check_tx = 7; ResponseCommit commit = 8; ResponseQuery query = 9; @@ -175,7 +175,7 @@ message ResponseSetOption{ string log = 1; } -message ResponseAppendTx{ +message ResponseDeliverTx{ CodeType code = 1; bytes data = 2; string log = 3; @@ -243,12 +243,12 @@ message Validator { //---------------------------------------- // Service Definition -service TMSPApplication { +service ABCIApplication { rpc Echo(RequestEcho) returns (ResponseEcho) ; rpc Flush(RequestFlush) returns (ResponseFlush); rpc Info(RequestInfo) returns (ResponseInfo); rpc SetOption(RequestSetOption) returns (ResponseSetOption); - rpc AppendTx(RequestAppendTx) returns (ResponseAppendTx); + rpc DeliverTx(RequestDeliverTx) returns (ResponseDeliverTx); rpc CheckTx(RequestCheckTx) returns (ResponseCheckTx); rpc Query(RequestQuery) returns (ResponseQuery); rpc Commit(RequestCommit) returns (ResponseCommit);