refactor code
This commit is contained in:
parent
cbf347e2aa
commit
0176a834d1
|
@ -104,7 +104,7 @@ func (cli *grpcClient) StopForError(err error) {
|
||||||
func (cli *grpcClient) Error() error {
|
func (cli *grpcClient) Error() error {
|
||||||
cli.mtx.Lock()
|
cli.mtx.Lock()
|
||||||
defer cli.mtx.Unlock()
|
defer cli.mtx.Unlock()
|
||||||
return cli.err
|
return errors.Wrap(cli.err, types.HumanCode(types.CodeType_InternalError))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set listener for all responses
|
// Set listener for all responses
|
||||||
|
@ -270,18 +270,12 @@ func (cli *grpcClient) SetOptionSync(key string, value string) (log string, err
|
||||||
|
|
||||||
func (cli *grpcClient) DeliverTxSync(tx []byte) (*types.ResponseDeliverTx, error) {
|
func (cli *grpcClient) DeliverTxSync(tx []byte) (*types.ResponseDeliverTx, error) {
|
||||||
reqres := cli.DeliverTxAsync(tx)
|
reqres := cli.DeliverTxAsync(tx)
|
||||||
if err := cli.Error(); err != nil {
|
return reqres.Response.GetDeliverTx(), cli.Error()
|
||||||
return nil, errors.Wrap(err, types.HumanCode(types.CodeType_InternalError))
|
|
||||||
}
|
|
||||||
return reqres.Response.GetDeliverTx(), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cli *grpcClient) CheckTxSync(tx []byte) (*types.ResponseCheckTx, error) {
|
func (cli *grpcClient) CheckTxSync(tx []byte) (*types.ResponseCheckTx, error) {
|
||||||
reqres := cli.CheckTxAsync(tx)
|
reqres := cli.CheckTxAsync(tx)
|
||||||
if err := cli.Error(); err != nil {
|
return reqres.Response.GetCheckTx(), cli.Error()
|
||||||
return nil, errors.Wrap(err, types.HumanCode(types.CodeType_InternalError))
|
|
||||||
}
|
|
||||||
return reqres.Response.GetCheckTx(), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cli *grpcClient) QuerySync(req types.RequestQuery) (*types.ResponseQuery, error) {
|
func (cli *grpcClient) QuerySync(req types.RequestQuery) (*types.ResponseQuery, error) {
|
||||||
|
@ -291,10 +285,7 @@ func (cli *grpcClient) QuerySync(req types.RequestQuery) (*types.ResponseQuery,
|
||||||
|
|
||||||
func (cli *grpcClient) CommitSync() (*types.ResponseCommit, error) {
|
func (cli *grpcClient) CommitSync() (*types.ResponseCommit, error) {
|
||||||
reqres := cli.CommitAsync()
|
reqres := cli.CommitAsync()
|
||||||
if err := cli.Error(); err != nil {
|
return reqres.Response.GetCommit(), cli.Error()
|
||||||
return nil, errors.Wrap(err, types.HumanCode(types.CodeType_InternalError))
|
|
||||||
}
|
|
||||||
return reqres.Response.GetCommit(), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cli *grpcClient) InitChainSync(params types.RequestInitChain) error {
|
func (cli *grpcClient) InitChainSync(params types.RequestInitChain) error {
|
||||||
|
|
|
@ -116,7 +116,7 @@ func (cli *socketClient) StopForError(err error) {
|
||||||
func (cli *socketClient) Error() error {
|
func (cli *socketClient) Error() error {
|
||||||
cli.mtx.Lock()
|
cli.mtx.Lock()
|
||||||
defer cli.mtx.Unlock()
|
defer cli.mtx.Unlock()
|
||||||
return cli.err
|
return errors.Wrap(cli.err, types.HumanCode(types.CodeType_InternalError))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set listener for all responses
|
// Set listener for all responses
|
||||||
|
@ -306,19 +306,13 @@ func (cli *socketClient) SetOptionSync(key string, value string) (log string, er
|
||||||
func (cli *socketClient) DeliverTxSync(tx []byte) (*types.ResponseDeliverTx, error) {
|
func (cli *socketClient) DeliverTxSync(tx []byte) (*types.ResponseDeliverTx, error) {
|
||||||
reqres := cli.queueRequest(types.ToRequestDeliverTx(tx))
|
reqres := cli.queueRequest(types.ToRequestDeliverTx(tx))
|
||||||
cli.FlushSync()
|
cli.FlushSync()
|
||||||
if err := cli.Error(); err != nil {
|
return reqres.Response.GetDeliverTx(), cli.Error()
|
||||||
return nil, errors.Wrap(err, types.HumanCode(types.CodeType_InternalError))
|
|
||||||
}
|
|
||||||
return reqres.Response.GetDeliverTx(), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cli *socketClient) CheckTxSync(tx []byte) (*types.ResponseCheckTx, error) {
|
func (cli *socketClient) CheckTxSync(tx []byte) (*types.ResponseCheckTx, error) {
|
||||||
reqres := cli.queueRequest(types.ToRequestCheckTx(tx))
|
reqres := cli.queueRequest(types.ToRequestCheckTx(tx))
|
||||||
cli.FlushSync()
|
cli.FlushSync()
|
||||||
if err := cli.Error(); err != nil {
|
return reqres.Response.GetCheckTx(), cli.Error()
|
||||||
return nil, errors.Wrap(err, types.HumanCode(types.CodeType_InternalError))
|
|
||||||
}
|
|
||||||
return reqres.Response.GetCheckTx(), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cli *socketClient) QuerySync(req types.RequestQuery) (*types.ResponseQuery, error) {
|
func (cli *socketClient) QuerySync(req types.RequestQuery) (*types.ResponseQuery, error) {
|
||||||
|
@ -330,10 +324,7 @@ func (cli *socketClient) QuerySync(req types.RequestQuery) (*types.ResponseQuery
|
||||||
func (cli *socketClient) CommitSync() (*types.ResponseCommit, error) {
|
func (cli *socketClient) CommitSync() (*types.ResponseCommit, error) {
|
||||||
reqres := cli.queueRequest(types.ToRequestCommit())
|
reqres := cli.queueRequest(types.ToRequestCommit())
|
||||||
cli.FlushSync()
|
cli.FlushSync()
|
||||||
if err := cli.Error(); err != nil {
|
return reqres.Response.GetCommit(), cli.Error()
|
||||||
return nil, errors.Wrap(err, types.HumanCode(types.CodeType_InternalError))
|
|
||||||
}
|
|
||||||
return reqres.Response.GetCommit(), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cli *socketClient) InitChainSync(params types.RequestInitChain) error {
|
func (cli *socketClient) InitChainSync(params types.RequestInitChain) error {
|
||||||
|
|
Loading…
Reference in New Issue