From 693d6d56ea58161ea393dc668d3836af772fce9e Mon Sep 17 00:00:00 2001
From: yedf2 <120050102@qq.com>
Date: Wed, 11 Aug 2021 19:12:05 +0800
Subject: [PATCH] some e2p renamed

---
 examples/base_grpc.go    |  4 ++--
 examples/base_types.go   |  8 +++-----
 examples/data.go         |  6 +++---
 examples/grpc_msg.go     |  2 +-
 examples/grpc_xa.go      |  2 +-
 examples/msg.go          |  4 ++--
 examples/quick_start.go  |  2 +-
 examples/saga.go         |  2 +-
 examples/saga_barrier.go |  2 +-
 examples/saga_wait.go    |  2 +-
 examples/tcc.go          |  6 +++---
 examples/tcc_barrier.go  | 14 +++++++-------
 examples/xa.go           |  4 ++--
 test/examples_test.go    |  1 +
 14 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/examples/base_grpc.go b/examples/base_grpc.go
index 64c397f..4c36208 100644
--- a/examples/base_grpc.go
+++ b/examples/base_grpc.go
@@ -124,8 +124,8 @@ func (s *busiServer) TransInTccNested(ctx context.Context, in *dtmgrpc.BusiReque
 	req := TransReq{}
 	dtmcli.MustUnmarshal(in.BusiData, &req)
 	tcc, err := dtmgrpc.TccFromRequest(in)
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	_, err = tcc.CallBranch(dtmcli.MustMarshal(req), BusiGrpc+"/examples.Busi/TransIn", BusiGrpc+"/examples.Busi/TransInConfirm", BusiGrpc+"/examples.Busi/TransInRevert")
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return &emptypb.Empty{}, handleGrpcBusiness(in, MainSwitch.TransInResult.Fetch(), req.TransInResult, dtmcli.GetFuncName())
 }
diff --git a/examples/base_types.go b/examples/base_types.go
index eb11406..24ab114 100644
--- a/examples/base_types.go
+++ b/examples/base_types.go
@@ -9,8 +9,6 @@ import (
 	"github.com/yedf/dtm/dtmcli"
 )
 
-var e2p = dtmcli.E2P
-
 // M alias
 type M = map[string]interface{}
 
@@ -45,7 +43,7 @@ func reqFrom(c *gin.Context) *TransReq {
 	if !ok {
 		req := TransReq{}
 		err := c.BindJSON(&req)
-		e2p(err)
+		dtmcli.FatalIfError(err)
 		c.Set("trans_req", &req)
 		v = &req
 	}
@@ -68,13 +66,13 @@ func dbGet() *common.DB {
 
 func sdbGet() *sql.DB {
 	db, err := dtmcli.SdbGet(config.DB)
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return db
 }
 
 // MustGetTrans construct transaction info from request
 func MustGetTrans(c *gin.Context) *dtmcli.BranchBarrier {
 	ti, err := dtmcli.BarrierFromQuery(c.Request.URL.Query())
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return ti
 }
diff --git a/examples/data.go b/examples/data.go
index a341777..52554b5 100644
--- a/examples/data.go
+++ b/examples/data.go
@@ -14,10 +14,10 @@ var config = common.DtmConfig
 // RunSQLScript 1
 func RunSQLScript(conf map[string]string, script string, skipDrop bool) {
 	con, err := dtmcli.SdbAlone(conf)
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	defer func() { con.Close() }()
 	content, err := ioutil.ReadFile(script)
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	sqls := strings.Split(string(content), ";")
 	for _, sql := range sqls {
 		s := strings.TrimSpace(sql)
@@ -25,7 +25,7 @@ func RunSQLScript(conf map[string]string, script string, skipDrop bool) {
 			continue
 		}
 		_, err = dtmcli.SdbExec(con, s)
-		e2p(err)
+		dtmcli.FatalIfError(err)
 	}
 }
 
diff --git a/examples/grpc_msg.go b/examples/grpc_msg.go
index 4647103..f87004b 100644
--- a/examples/grpc_msg.go
+++ b/examples/grpc_msg.go
@@ -12,6 +12,6 @@ func MsgGrpcFireRequest() string {
 		Add(BusiGrpc+"/examples.Busi/TransOut", req).
 		Add(BusiGrpc+"/examples.Busi/TransIn", req)
 	err := msg.Submit()
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return msg.Gid
 }
diff --git a/examples/grpc_xa.go b/examples/grpc_xa.go
index f1a596d..10ab142 100644
--- a/examples/grpc_xa.go
+++ b/examples/grpc_xa.go
@@ -35,6 +35,6 @@ func XaGrpcFireRequest() string {
 		_, err = xa.CallBranch(busiData, BusiGrpc+"/examples.Busi/TransInXa")
 		return err
 	})
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return gid
 }
diff --git a/examples/msg.go b/examples/msg.go
index a8527b8..13980c6 100644
--- a/examples/msg.go
+++ b/examples/msg.go
@@ -12,9 +12,9 @@ func MsgFireRequest() string {
 		Add(Busi+"/TransOut", req).
 		Add(Busi+"/TransIn", req)
 	err := msg.Prepare(Busi + "/TransQuery")
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	dtmcli.Logf("busi trans submit")
 	err = msg.Submit()
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return msg.Gid
 }
diff --git a/examples/quick_start.go b/examples/quick_start.go
index 40a4787..dafeaf1 100644
--- a/examples/quick_start.go
+++ b/examples/quick_start.go
@@ -37,7 +37,7 @@ func QsFireRequest() string {
 		Add(qsBusi+"/TransIn", qsBusi+"/TransInCompensate", req)
 	// 提交saga事务，dtm会完成所有的子事务/回滚所有的子事务
 	err := saga.Submit()
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return saga.Gid
 }
 
diff --git a/examples/saga.go b/examples/saga.go
index 3912fc9..791ecea 100644
--- a/examples/saga.go
+++ b/examples/saga.go
@@ -18,6 +18,6 @@ func SagaFireRequest() string {
 	dtmcli.Logf("saga busi trans submit")
 	err := saga.Submit()
 	dtmcli.Logf("result gid is: %s", saga.Gid)
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return saga.Gid
 }
diff --git a/examples/saga_barrier.go b/examples/saga_barrier.go
index 9da16a0..e42256d 100644
--- a/examples/saga_barrier.go
+++ b/examples/saga_barrier.go
@@ -17,7 +17,7 @@ func SagaBarrierFireRequest() string {
 		Add(Busi+"/SagaBTransIn", Busi+"/SagaBTransInCompensate", req)
 	dtmcli.Logf("busi trans submit")
 	err := saga.Submit()
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return saga.Gid
 }
 
diff --git a/examples/saga_wait.go b/examples/saga_wait.go
index 56da691..efa3865 100644
--- a/examples/saga_wait.go
+++ b/examples/saga_wait.go
@@ -18,6 +18,6 @@ func SagaWaitFireRequest() string {
 	saga.WaitResult = true // 设置为等待结果模式，后面的submit调用，会等待服务器处理这个事务。如果Submit正常返回，那么整个全局事务已成功完成
 	err := saga.Submit()
 	dtmcli.Logf("result gid is: %s", saga.Gid)
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return saga.Gid
 }
diff --git a/examples/tcc.go b/examples/tcc.go
index 893f115..65046d8 100644
--- a/examples/tcc.go
+++ b/examples/tcc.go
@@ -11,7 +11,7 @@ func init() {
 	setupFuncs["TccSetupSetup"] = func(app *gin.Engine) {
 		app.POST(BusiAPI+"/TransInTccParent", common.WrapHandler(func(c *gin.Context) (interface{}, error) {
 			tcc, err := dtmcli.TccFromQuery(c.Request.URL.Query())
-			e2p(err)
+			dtmcli.FatalIfError(err)
 			dtmcli.Logf("TransInTccParent ")
 			return tcc.CallBranch(&TransReq{Amount: reqFrom(c).Amount}, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
 		}))
@@ -28,7 +28,7 @@ func TccFireRequestNested() string {
 		}
 		return tcc.CallBranch(&TransReq{Amount: 30}, Busi+"/TransInTccParent", Busi+"/TransInConfirm", Busi+"/TransInRevert")
 	})
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return gid
 }
 
@@ -43,6 +43,6 @@ func TccFireRequest() string {
 		}
 		return tcc.CallBranch(&TransReq{Amount: 30}, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
 	})
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return gid
 }
diff --git a/examples/tcc_barrier.go b/examples/tcc_barrier.go
index 95b7780..c9edfc2 100644
--- a/examples/tcc_barrier.go
+++ b/examples/tcc_barrier.go
@@ -21,7 +21,7 @@ func TccBarrierFireRequest() string {
 		}
 		return tcc.CallBranch(&TransReq{Amount: 30}, Busi+"/TccBTransInTry", Busi+"/TccBTransInConfirm", Busi+"/TccBTransInCancel")
 	})
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return gid
 }
 
@@ -66,21 +66,21 @@ func tccBarrierTransInTry(c *gin.Context) (interface{}, error) {
 		return req.TransInResult, nil
 	}
 	barrier := MustGetTrans(c)
-	return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
+	return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
 		return adjustTrading(sdb, transInUID, req.Amount)
 	})
 }
 
 func tccBarrierTransInConfirm(c *gin.Context) (interface{}, error) {
 	barrier := MustGetTrans(c)
-	return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
+	return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
 		return adjustBalance(sdb, transInUID, reqFrom(c).Amount)
 	})
 }
 
 func tccBarrierTransInCancel(c *gin.Context) (interface{}, error) {
 	barrier := MustGetTrans(c)
-	return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
+	return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
 		return adjustTrading(sdb, transInUID, -reqFrom(c).Amount)
 	})
 }
@@ -91,14 +91,14 @@ func tccBarrierTransOutTry(c *gin.Context) (interface{}, error) {
 		return req.TransInResult, nil
 	}
 	barrier := MustGetTrans(c)
-	return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
+	return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
 		return adjustTrading(sdb, transOutUID, -req.Amount)
 	})
 }
 
 func tccBarrierTransOutConfirm(c *gin.Context) (interface{}, error) {
 	barrier := MustGetTrans(c)
-	return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
+	return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
 		return adjustBalance(sdb, transOutUID, -reqFrom(c).Amount)
 	})
 }
@@ -106,7 +106,7 @@ func tccBarrierTransOutConfirm(c *gin.Context) (interface{}, error) {
 // TccBarrierTransOutCancel will be use in test
 func TccBarrierTransOutCancel(c *gin.Context) (interface{}, error) {
 	barrier := MustGetTrans(c)
-	return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
+	return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
 		return adjustTrading(sdb, transOutUID, reqFrom(c).Amount)
 	})
 }
diff --git a/examples/xa.go b/examples/xa.go
index 1369e33..5ad5088 100644
--- a/examples/xa.go
+++ b/examples/xa.go
@@ -18,7 +18,7 @@ func init() {
 				return xa.HandleCallback(c.Query("gid"), c.Query("branch_id"), c.Query("branch_type"))
 			}))
 		})
-		e2p(err)
+		dtmcli.FatalIfError(err)
 	}
 }
 
@@ -32,6 +32,6 @@ func XaFireRequest() string {
 		}
 		return xa.CallBranch(&TransReq{Amount: 30}, Busi+"/TransInXa")
 	})
-	e2p(err)
+	dtmcli.FatalIfError(err)
 	return gid
 }
diff --git a/test/examples_test.go b/test/examples_test.go
index 51fffb5..5aae246 100644
--- a/test/examples_test.go
+++ b/test/examples_test.go
@@ -19,4 +19,5 @@ func TestExamples(t *testing.T) {
 	assertSucceed(t, examples.TccFireRequestNested())
 	assertSucceed(t, examples.XaFireRequest())
 	assertSucceed(t, examples.MsgGrpcFireRequest())
+	assertSucceed(t, examples.GrpcSagaFireRequest())
 }