diff --git a/client/client.go b/client/client.go index adb2c463..5c123026 100644 --- a/client/client.go +++ b/client/client.go @@ -207,8 +207,8 @@ func (cli *TMSPClient) CheckTxAsync(tx []byte) *ReqRes { return cli.queueRequest(types.RequestCheckTx(tx)) } -func (cli *TMSPClient) GetHashAsync() *ReqRes { - return cli.queueRequest(types.RequestGetHash()) +func (cli *TMSPClient) CommitAsync() *ReqRes { + return cli.queueRequest(types.RequestCommit()) } func (cli *TMSPClient) QueryAsync(query []byte) *ReqRes { @@ -251,8 +251,8 @@ func (cli *TMSPClient) CheckTxSync(tx []byte) (code types.CodeType, result []byt return res.Code, res.Data, res.Log, nil } -func (cli *TMSPClient) GetHashSync() (hash []byte, log string, err error) { - reqres := cli.queueRequest(types.RequestGetHash()) +func (cli *TMSPClient) CommitSync() (hash []byte, log string, err error) { + reqres := cli.queueRequest(types.RequestCommit()) cli.FlushSync() if cli.err != nil { return nil, "", cli.err diff --git a/cmd/tmsp-cli/tmsp-cli.go b/cmd/tmsp-cli/tmsp-cli.go index fba8f130..f111b3e9 100644 --- a/cmd/tmsp-cli/tmsp-cli.go +++ b/cmd/tmsp-cli/tmsp-cli.go @@ -83,7 +83,7 @@ func main() { Name: "get_hash", Usage: "Get application Merkle root hash", Action: func(c *cli.Context) { - cmdGetHash(c) + cmdCommit(c) }, }, { @@ -245,8 +245,8 @@ func cmdCheckTx(c *cli.Context) { } // Get application Merkle root hash -func cmdGetHash(c *cli.Context) { - res, err := makeRequest(conn, types.RequestGetHash()) +func cmdCommit(c *cli.Context) { + res, err := makeRequest(conn, types.RequestCommit()) if err != nil { fmt.Println(err.Error()) return diff --git a/example/golang/counter.go b/example/golang/counter.go index 1d1081df..b4da31bf 100644 --- a/example/golang/counter.go +++ b/example/golang/counter.go @@ -54,7 +54,7 @@ func (app *CounterApplication) CheckTx(tx []byte) (code types.CodeType, result [ return types.CodeType_OK, nil, "" } -func (app *CounterApplication) GetHash() (hash []byte, log string) { +func (app *CounterApplication) Commit() (hash []byte, log string) { app.hashCount += 1 if app.txCount == 0 { diff --git a/example/golang/dummy.go b/example/golang/dummy.go index 2f1e7b90..818cd363 100644 --- a/example/golang/dummy.go +++ b/example/golang/dummy.go @@ -42,7 +42,7 @@ func (app *DummyApplication) CheckTx(tx []byte) (code types.CodeType, result []b return types.CodeType_OK, nil, "" } -func (app *DummyApplication) GetHash() (hash []byte, log string) { +func (app *DummyApplication) Commit() (hash []byte, log string) { hash = app.state.Hash() return hash, "" } diff --git a/server/server.go b/server/server.go index d5d1a124..933aa4c6 100644 --- a/server/server.go +++ b/server/server.go @@ -112,9 +112,9 @@ func handleRequest(app types.Application, req *types.Request, responses chan<- * case types.MessageType_CheckTx: code, result, logStr := app.CheckTx(req.Data) responses <- types.ResponseCheckTx(code, result, logStr) - case types.MessageType_GetHash: - hash, logStr := app.GetHash() - responses <- types.ResponseGetHash(hash, logStr) + case types.MessageType_Commit: + hash, logStr := app.Commit() + responses <- types.ResponseCommit(hash, logStr) case types.MessageType_Query: code, result, logStr := app.Query(req.Data) responses <- types.ResponseQuery(code, result, logStr) diff --git a/types/application.go b/types/application.go index 8f27282f..d0379df0 100644 --- a/types/application.go +++ b/types/application.go @@ -15,7 +15,7 @@ type Application interface { CheckTx(tx []byte) (code CodeType, result []byte, log string) // Return the application Merkle root hash - GetHash() (hash []byte, log string) + Commit() (hash []byte, log string) // Query for state Query(query []byte) (code CodeType, result []byte, log string) diff --git a/types/messages.go b/types/messages.go index 736745bf..49c02bea 100644 --- a/types/messages.go +++ b/types/messages.go @@ -48,9 +48,9 @@ func RequestCheckTx(txBytes []byte) *Request { } } -func RequestGetHash() *Request { +func RequestCommit() *Request { return &Request{ - Type: MessageType_GetHash, + Type: MessageType_Commit, } } @@ -115,9 +115,9 @@ func ResponseCheckTx(code CodeType, result []byte, log string) *Response { } } -func ResponseGetHash(hash []byte, log string) *Response { +func ResponseCommit(hash []byte, log string) *Response { return &Response{ - Type: MessageType_GetHash, + Type: MessageType_Commit, Data: hash, Log: log, } diff --git a/types/types.pb.go b/types/types.pb.go index 8e86ed28..ec1bb40d 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -34,7 +34,7 @@ const ( MessageType_Exception MessageType = 5 MessageType_AppendTx MessageType = 17 MessageType_CheckTx MessageType = 18 - MessageType_GetHash MessageType = 19 + MessageType_Commit MessageType = 19 MessageType_Query MessageType = 20 ) @@ -47,7 +47,7 @@ var MessageType_name = map[int32]string{ 5: "Exception", 17: "AppendTx", 18: "CheckTx", - 19: "GetHash", + 19: "Commit", 20: "Query", } var MessageType_value = map[string]int32{ @@ -59,7 +59,7 @@ var MessageType_value = map[string]int32{ "Exception": 5, "AppendTx": 17, "CheckTx": 18, - "GetHash": 19, + "Commit": 19, "Query": 20, } @@ -143,31 +143,31 @@ func init() { } var fileDescriptor0 = []byte{ - // 405 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0xdf, 0x6e, 0xd3, 0x30, - 0x14, 0xc6, 0x49, 0x9b, 0xf4, 0xcf, 0x69, 0xd7, 0xb9, 0x87, 0x22, 0xe5, 0x12, 0x0d, 0x09, 0xa1, - 0x5d, 0x0c, 0x69, 0x3c, 0xc1, 0x98, 0x3a, 0xa8, 0x10, 0x9b, 0x08, 0xdb, 0x03, 0x18, 0xe7, 0xb4, - 0x8d, 0x1a, 0x8e, 0x43, 0x6c, 0xc3, 0xca, 0x43, 0x70, 0xc3, 0x73, 0xf0, 0x8e, 0xd8, 0x4e, 0x27, - 0x8d, 0x6b, 0x6e, 0xa2, 0xf3, 0x7d, 0xf6, 0xf9, 0xce, 0xcf, 0x8e, 0x61, 0x6e, 0xf7, 0x0d, 0x99, - 0xd7, 0xf1, 0x7b, 0xd6, 0xb4, 0xda, 0x6a, 0xcc, 0xa2, 0x38, 0xf9, 0x0a, 0xc3, 0x82, 0xbe, 0x39, - 0x32, 0x16, 0x5f, 0x42, 0x1a, 0xbc, 0x3c, 0x79, 0x9e, 0xbc, 0x9a, 0x9d, 0xe3, 0x59, 0xb7, 0xfb, - 0x23, 0x19, 0x23, 0x37, 0x74, 0xeb, 0x45, 0x11, 0xd7, 0x11, 0x21, 0x2d, 0xa5, 0x95, 0x79, 0xcf, - 0xef, 0x9b, 0x16, 0xb1, 0x46, 0x01, 0xfd, 0x1d, 0xed, 0xf3, 0xbe, 0xb7, 0xc6, 0x45, 0x28, 0x71, - 0x01, 0xd9, 0x77, 0x59, 0x3b, 0xca, 0xd3, 0xe8, 0x75, 0xe2, 0xe4, 0x77, 0x02, 0xa3, 0x82, 0x4c, - 0xa3, 0xd9, 0xd0, 0x7f, 0x0d, 0x7c, 0x01, 0xa9, 0xd2, 0x25, 0xc5, 0x89, 0xb3, 0xf3, 0xe3, 0x43, - 0xef, 0xa5, 0xb7, 0xba, 0xc6, 0xb0, 0x18, 0x18, 0xa8, 0x6d, 0x75, 0xfb, 0xc0, 0x10, 0x45, 0x60, - 0xad, 0xf5, 0x26, 0xcf, 0x3a, 0x56, 0x5f, 0x9e, 0xfe, 0x4a, 0x60, 0xf2, 0x68, 0x2c, 0x1e, 0xc3, - 0xe4, 0xda, 0xd5, 0xf5, 0xc1, 0x12, 0x4f, 0x70, 0x04, 0xe9, 0x52, 0x6d, 0xb5, 0x48, 0x70, 0x0c, - 0xd9, 0x55, 0xed, 0xcc, 0x56, 0xf4, 0x82, 0xb9, 0xe2, 0xb5, 0x16, 0x7d, 0x3c, 0x82, 0xf1, 0x67, - 0xb2, 0x37, 0x8d, 0xad, 0x34, 0x8b, 0x34, 0xc8, 0xe5, 0xbd, 0xa2, 0x4e, 0x66, 0x38, 0x85, 0xd1, - 0x45, 0xd3, 0x10, 0x97, 0xb7, 0xf7, 0x62, 0x8e, 0x13, 0x18, 0x5e, 0x6e, 0x49, 0xed, 0xbc, 0xc0, - 0x20, 0xde, 0x91, 0x7d, 0x2f, 0x7d, 0xde, 0xd3, 0x10, 0xfd, 0xc9, 0x51, 0xbb, 0x17, 0x8b, 0xd3, - 0x3f, 0xfe, 0x9a, 0x1e, 0xce, 0x82, 0x03, 0xe8, 0xdd, 0x7c, 0xf0, 0x10, 0x73, 0x38, 0x5a, 0xb1, - 0xa5, 0x96, 0x65, 0xbd, 0x0c, 0x07, 0xf1, 0x34, 0x02, 0xa6, 0x77, 0x2c, 0x9d, 0xdd, 0xea, 0xb6, - 0xfa, 0x49, 0xa5, 0x87, 0x5a, 0x80, 0x58, 0xb1, 0x71, 0xeb, 0x75, 0xa5, 0x2a, 0x62, 0x7b, 0x45, - 0x64, 0x3c, 0x20, 0xc2, 0xec, 0x8e, 0x77, 0xac, 0x7f, 0xf0, 0xe1, 0x67, 0x7b, 0x4a, 0x1f, 0xb7, - 0x64, 0x7f, 0x4d, 0x15, 0x6f, 0xba, 0xb8, 0x48, 0xfa, 0x56, 0x96, 0xd7, 0x9a, 0x15, 0x89, 0xc1, - 0xa3, 0xa6, 0x0b, 0xa5, 0xb4, 0x63, 0x2b, 0x86, 0xf8, 0x0c, 0xe6, 0xff, 0xc4, 0x3b, 0x2e, 0x8d, - 0x18, 0x7d, 0x19, 0xc4, 0x37, 0xf5, 0xe6, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x90, 0x25, - 0x05, 0x68, 0x02, 0x00, 0x00, + // 406 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0x5f, 0x6e, 0xd3, 0x40, + 0x10, 0xc6, 0x71, 0x62, 0xe7, 0xcf, 0x24, 0x4d, 0x37, 0x43, 0x90, 0xfc, 0x88, 0x8a, 0x84, 0x50, + 0x1f, 0x8a, 0x54, 0x4e, 0x50, 0xa2, 0x54, 0x8a, 0x10, 0xad, 0x30, 0xed, 0x01, 0xcc, 0x7a, 0x12, + 0x5b, 0x71, 0x66, 0x8d, 0x77, 0x17, 0x1a, 0xee, 0xc0, 0x13, 0xe7, 0xe0, 0x8e, 0xec, 0xae, 0x53, + 0xa9, 0x3c, 0xf7, 0xc5, 0x9a, 0xef, 0xdb, 0x9d, 0x99, 0xdf, 0x8c, 0x17, 0xe6, 0xe6, 0xd0, 0x90, + 0x7e, 0x1f, 0xbe, 0x17, 0x4d, 0xab, 0x8c, 0xc2, 0x24, 0x88, 0xb3, 0x3d, 0x0c, 0x33, 0xfa, 0x6e, + 0x49, 0x1b, 0x7c, 0x0b, 0xb1, 0xf7, 0xd2, 0xe8, 0x75, 0xf4, 0x6e, 0x76, 0x89, 0x17, 0xdd, 0xed, + 0xcf, 0xa4, 0x75, 0xbe, 0xa5, 0x3b, 0x27, 0xb2, 0x70, 0x8e, 0x08, 0x71, 0x91, 0x9b, 0x3c, 0xed, + 0xb9, 0x7b, 0xd3, 0x2c, 0xc4, 0x28, 0xa0, 0xbf, 0xa3, 0x43, 0xda, 0x77, 0xd6, 0x38, 0xf3, 0x21, + 0x2e, 0x20, 0xf9, 0x91, 0xd7, 0x96, 0xd2, 0x38, 0x78, 0x9d, 0x38, 0xfb, 0x13, 0xc1, 0x28, 0x23, + 0xdd, 0x28, 0xd6, 0xf4, 0xac, 0x86, 0x6f, 0x20, 0x96, 0xaa, 0xa0, 0xd0, 0x71, 0x76, 0x79, 0x7a, + 0xcc, 0x5d, 0x3a, 0xab, 0x4b, 0xf4, 0x87, 0x9e, 0x81, 0xda, 0x56, 0xb5, 0x8f, 0x0c, 0x41, 0x78, + 0xd6, 0x5a, 0x6d, 0xd3, 0xa4, 0x63, 0x75, 0xe1, 0xf9, 0xef, 0x08, 0x26, 0x4f, 0xda, 0xe2, 0x29, + 0x4c, 0x6e, 0x6c, 0x5d, 0x1f, 0x2d, 0xf1, 0x02, 0x47, 0x10, 0xaf, 0x64, 0xa9, 0x44, 0x84, 0x63, + 0x48, 0xae, 0x6b, 0xab, 0x4b, 0xd1, 0xf3, 0xe6, 0x9a, 0x37, 0x4a, 0xf4, 0xf1, 0x04, 0xc6, 0x5f, + 0xc9, 0xdc, 0x36, 0xa6, 0x52, 0x2c, 0x62, 0x2f, 0x57, 0x0f, 0x92, 0x3a, 0x99, 0xe0, 0x14, 0x46, + 0x57, 0x4d, 0x43, 0x5c, 0xdc, 0x3d, 0x88, 0x39, 0x4e, 0x60, 0xb8, 0x2c, 0x49, 0xee, 0x9c, 0x70, + 0x83, 0xc1, 0x60, 0xa9, 0xf6, 0xfb, 0xca, 0x88, 0x97, 0xbe, 0xf2, 0x17, 0x4b, 0xed, 0x41, 0x2c, + 0xce, 0xff, 0xba, 0x2d, 0x3d, 0x8e, 0x82, 0x03, 0xe8, 0xdd, 0x7e, 0x72, 0x0c, 0x73, 0x38, 0x59, + 0xb3, 0xa1, 0x96, 0xf3, 0x7a, 0xe5, 0xe7, 0x70, 0x30, 0x02, 0xa6, 0xf7, 0x9c, 0x5b, 0x53, 0xaa, + 0xb6, 0xfa, 0x45, 0x85, 0x63, 0x5a, 0x80, 0x58, 0xb3, 0xb6, 0x9b, 0x4d, 0x25, 0x2b, 0x62, 0x73, + 0x4d, 0xa4, 0x1d, 0x1f, 0xc2, 0xec, 0x9e, 0x77, 0xac, 0x7e, 0xf2, 0xf1, 0x5f, 0x3b, 0x48, 0x57, + 0x6e, 0xc5, 0x6e, 0x4b, 0x15, 0x6f, 0xbb, 0x72, 0x01, 0xf4, 0x63, 0x5e, 0xdc, 0x28, 0x96, 0x24, + 0x06, 0x4f, 0x92, 0xae, 0xa4, 0x54, 0x96, 0x8d, 0x18, 0xe2, 0x2b, 0x98, 0xff, 0x57, 0xde, 0x72, + 0xa1, 0xc5, 0xe8, 0xdb, 0x20, 0x3c, 0xa9, 0x0f, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x41, 0x3b, + 0x4f, 0x97, 0x67, 0x02, 0x00, 0x00, } diff --git a/types/types.proto b/types/types.proto index f14276d1..f9da8e7d 100644 --- a/types/types.proto +++ b/types/types.proto @@ -16,7 +16,7 @@ enum MessageType { Exception = 0x05; AppendTx = 0x11; CheckTx = 0x12; - GetHash = 0x13; + Commit = 0x13; Query = 0x14; }