Browse Source

fix lint

pull/234/head
yedf2 4 years ago
parent
commit
416b98285b
  1. 2
      dtmcli/dtmimp/consts.go
  2. 2
      dtmcli/dtmimp/trans_base.go
  3. 8
      test/msg_jrpc_test.go
  4. 2
      test/tcc_jrpc_test.go

2
dtmcli/dtmimp/consts.go

@ -19,4 +19,6 @@ const (
DBTypePostgres = "postgres" DBTypePostgres = "postgres"
// DBTypeRedis const for driver redis // DBTypeRedis const for driver redis
DBTypeRedis = "redis" DBTypeRedis = "redis"
// Jrpc const for json-rpc
Jrpc = "json-rpc"
) )

2
dtmcli/dtmimp/trans_base.go

@ -94,7 +94,7 @@ func TransCallDtm(tb *TransBase, body interface{}, operation string) error {
if tb.RequestTimeout != 0 { if tb.RequestTimeout != 0 {
RestyClient.SetTimeout(time.Duration(tb.RequestTimeout) * time.Second) RestyClient.SetTimeout(time.Duration(tb.RequestTimeout) * time.Second)
} }
if tb.Protocol == "json-rpc" { if tb.Protocol == Jrpc {
var result map[string]interface{} var result map[string]interface{}
resp, err := RestyClient.R(). resp, err := RestyClient.R().
SetBody(map[string]interface{}{ SetBody(map[string]interface{}{

8
test/msg_jrpc_test.go

@ -33,7 +33,7 @@ func TestMsgJrpcDoAndSubmit(t *testing.T) {
req := busi.GenTransReq(30, false, false) req := busi.GenTransReq(30, false, false)
msg := dtmcli.NewMsg(dtmutil.DefaultJrpcServer, gid). msg := dtmcli.NewMsg(dtmutil.DefaultJrpcServer, gid).
Add(busi.Busi+"/SagaBTransIn", req) Add(busi.Busi+"/SagaBTransIn", req)
msg.Protocol = "json-rpc" msg.Protocol = dtmimp.Jrpc
err := msg.DoAndSubmitDB(Busi+"/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error { err := msg.DoAndSubmitDB(Busi+"/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error {
return busi.SagaAdjustBalance(tx, busi.TransOutUID, -req.Amount, "SUCCESS") return busi.SagaAdjustBalance(tx, busi.TransOutUID, -req.Amount, "SUCCESS")
}) })
@ -50,7 +50,7 @@ func TestMsgJrpcDoAndSubmitBusiFailed(t *testing.T) {
req := busi.GenTransReq(30, false, false) req := busi.GenTransReq(30, false, false)
msg := dtmcli.NewMsg(dtmutil.DefaultJrpcServer, gid). msg := dtmcli.NewMsg(dtmutil.DefaultJrpcServer, gid).
Add(busi.Busi+"/SagaBTransIn", req) Add(busi.Busi+"/SagaBTransIn", req)
msg.Protocol = "json-rpc" msg.Protocol = dtmimp.Jrpc
err := msg.DoAndSubmitDB(Busi+"/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error { err := msg.DoAndSubmitDB(Busi+"/QueryPreparedB", dbGet().ToSQLDB(), func(tx *sql.Tx) error {
return errors.New("an error") return errors.New("an error")
}) })
@ -75,7 +75,7 @@ func TestMsgJprcAbnormal(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
assert.Contains(t, resp.String(), "-32700") assert.Contains(t, resp.String(), "-32700")
resp, err = dtmcli.GetRestyClient().R().SetBody("hello").Post("http://localhost:1001") _, err = dtmcli.GetRestyClient().R().SetBody("hello").Post("http://localhost:1001")
assert.Error(t, err) assert.Error(t, err)
resp, err = dtmcli.GetRestyClient().R().SetBody(map[string]string{ resp, err = dtmcli.GetRestyClient().R().SetBody(map[string]string{
@ -121,6 +121,6 @@ func genJrpcMsg(gid string) *dtmcli.Msg {
Add(busi.Busi+"/TransOut", &req). Add(busi.Busi+"/TransOut", &req).
Add(busi.Busi+"/TransIn", &req) Add(busi.Busi+"/TransIn", &req)
msg.QueryPrepared = busi.Busi + "/QueryPrepared" msg.QueryPrepared = busi.Busi + "/QueryPrepared"
msg.Protocol = "json-rpc" msg.Protocol = dtmimp.Jrpc
return msg return msg
} }

2
test/tcc_jrpc_test.go

@ -15,7 +15,7 @@ func TestTccJrpcNormal(t *testing.T) {
req := busi.GenTransReq(30, false, false) req := busi.GenTransReq(30, false, false)
gid := dtmimp.GetFuncName() gid := dtmimp.GetFuncName()
err := dtmcli.TccGlobalTransaction2(dtmutil.DefaultJrpcServer, gid, func(tcc *dtmcli.Tcc) { err := dtmcli.TccGlobalTransaction2(dtmutil.DefaultJrpcServer, gid, func(tcc *dtmcli.Tcc) {
tcc.Protocol = "json-rpc" tcc.Protocol = dtmimp.Jrpc
}, func(tcc *dtmcli.Tcc) (*resty.Response, error) { }, func(tcc *dtmcli.Tcc) (*resty.Response, error) {
_, err := tcc.CallBranch(req, Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert") _, err := tcc.CallBranch(req, Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert")
assert.Nil(t, err) assert.Nil(t, err)

Loading…
Cancel
Save