Merge pull request #201 from Bytom/v0.1

[bytom/vapor.git] / vendor / github.com / tendermint / abci / client / client.go

diff --git a/vendor/github.com/tendermint/abci/client/client.go b/vendor/github.com/tendermint/abci/client/client.go
deleted file mode 100644 (file)
index 51d0412..0000000
--- a/vendor/github.com/tendermint/abci/client/client.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package abcicli
-
-import (
-       "fmt"
-       "sync"
-
-       "github.com/tendermint/abci/types"
-       cmn "github.com/tendermint/tmlibs/common"
-)
-
-type Client interface {
-       cmn.Service
-
-       SetResponseCallback(Callback)
-       Error() error
-
-       FlushAsync() *ReqRes
-       EchoAsync(msg string) *ReqRes
-       InfoAsync(types.RequestInfo) *ReqRes
-       SetOptionAsync(key string, value string) *ReqRes
-       DeliverTxAsync(tx []byte) *ReqRes
-       CheckTxAsync(tx []byte) *ReqRes
-       QueryAsync(types.RequestQuery) *ReqRes
-       CommitAsync() *ReqRes
-
-       FlushSync() error
-       EchoSync(msg string) (res types.Result)
-       InfoSync(types.RequestInfo) (resInfo types.ResponseInfo, err error)
-       SetOptionSync(key string, value string) (res types.Result)
-       DeliverTxSync(tx []byte) (res types.Result)
-       CheckTxSync(tx []byte) (res types.Result)
-       QuerySync(types.RequestQuery) (resQuery types.ResponseQuery, err error)
-       CommitSync() (res types.Result)
-
-       InitChainAsync(types.RequestInitChain) *ReqRes
-       BeginBlockAsync(types.RequestBeginBlock) *ReqRes
-       EndBlockAsync(height uint64) *ReqRes
-
-       InitChainSync(types.RequestInitChain) (err error)
-       BeginBlockSync(types.RequestBeginBlock) (err error)
-       EndBlockSync(height uint64) (resEndBlock types.ResponseEndBlock, err error)
-}
-
-//----------------------------------------
-
-// NewClient returns a new ABCI client of the specified transport type.
-// It returns an error if the transport is not "socket" or "grpc"
-func NewClient(addr, transport string, mustConnect bool) (client Client, err error) {
-       switch transport {
-       case "socket":
-               client = NewSocketClient(addr, mustConnect)
-       case "grpc":
-               client = NewGRPCClient(addr, mustConnect)
-       default:
-               err = fmt.Errorf("Unknown abci transport %s", transport)
-       }
-       return
-}
-
-//----------------------------------------
-
-type Callback func(*types.Request, *types.Response)
-
-//----------------------------------------
-
-type ReqRes struct {
-       *types.Request
-       *sync.WaitGroup
-       *types.Response // Not set atomically, so be sure to use WaitGroup.
-
-       mtx  sync.Mutex
-       done bool                  // Gets set to true once *after* WaitGroup.Done().
-       cb   func(*types.Response) // A single callback that may be set.
-}
-
-func NewReqRes(req *types.Request) *ReqRes {
-       return &ReqRes{
-               Request:   req,
-               WaitGroup: waitGroup1(),
-               Response:  nil,
-
-               done: false,
-               cb:   nil,
-       }
-}
-
-// Sets the callback for this ReqRes atomically.
-// If reqRes is already done, calls cb immediately.
-// NOTE: reqRes.cb should not change if reqRes.done.
-// NOTE: only one callback is supported.
-func (reqRes *ReqRes) SetCallback(cb func(res *types.Response)) {
-       reqRes.mtx.Lock()
-
-       if reqRes.done {
-               reqRes.mtx.Unlock()
-               cb(reqRes.Response)
-               return
-       }
-
-       defer reqRes.mtx.Unlock()
-       reqRes.cb = cb
-}
-
-func (reqRes *ReqRes) GetCallback() func(*types.Response) {
-       reqRes.mtx.Lock()
-       defer reqRes.mtx.Unlock()
-       return reqRes.cb
-}
-
-// NOTE: it should be safe to read reqRes.cb without locks after this.
-func (reqRes *ReqRes) SetDone() {
-       reqRes.mtx.Lock()
-       reqRes.done = true
-       reqRes.mtx.Unlock()
-}
-
-func waitGroup1() (wg *sync.WaitGroup) {
-       wg = &sync.WaitGroup{}
-       wg.Add(1)
-       return
-}