From 1f0c4490e84a218e0d148f6afe17bd53ab02356d Mon Sep 17 00:00:00 2001
From: yedf2 <120050102@qq.com>
Date: Mon, 22 Nov 2021 14:03:29 +0800
Subject: [PATCH] TransOptions move to dtmcli

---
 dtmcli/types.go           | 3 +++
 dtmsvr/trans_class.go     | 3 ++-
 examples/http_saga.go     | 2 +-
 test/dtmsvr_test.go       | 3 ++-
 test/saga_options_test.go | 6 +++---
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dtmcli/types.go b/dtmcli/types.go
index ccd34d2..4b502c8 100644
--- a/dtmcli/types.go
+++ b/dtmcli/types.go
@@ -28,6 +28,9 @@ type DB = dtmimp.DB
 // Tx interface
 type Tx = dtmimp.Tx
 
+// TransOptions transaction option
+type TransOptions = dtmimp.TransOptions
+
 // SetCurrentDBType set currentDBType
 func SetCurrentDBType(dbType string) {
 	dtmimp.SetCurrentDBType(dbType)
diff --git a/dtmsvr/trans_class.go b/dtmsvr/trans_class.go
index 6d605e2..40fbc36 100644
--- a/dtmsvr/trans_class.go
+++ b/dtmsvr/trans_class.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/yedf/dtm/common"
+	"github.com/yedf/dtm/dtmcli"
 	"github.com/yedf/dtm/dtmcli/dtmimp"
 	"github.com/yedf/dtm/dtmgrpc/dtmgimp"
 	"gorm.io/gorm"
@@ -38,7 +39,7 @@ type TransGlobal struct {
 	CustomData       string `json:"custom_data"`
 	NextCronInterval int64
 	NextCronTime     *time.Time
-	dtmimp.TransOptions
+	dtmcli.TransOptions
 	lastTouched      time.Time // record the start time of process
 	updateBranchSync bool
 }
diff --git a/examples/http_saga.go b/examples/http_saga.go
index 6ea09ef..64071cb 100644
--- a/examples/http_saga.go
+++ b/examples/http_saga.go
@@ -30,7 +30,7 @@ func init() {
 		saga := dtmcli.NewSaga(DtmServer, dtmcli.MustGenGid(DtmServer)).
 			Add(Busi+"/TransOut", Busi+"/TransOutRevert", req).
 			Add(Busi+"/TransIn", Busi+"/TransInRevert", req)
-		saga.SetOptions(&dtmimp.TransOptions{WaitResult: true})
+		saga.SetOptions(&dtmcli.TransOptions{WaitResult: true})
 		err := saga.Submit()
 		dtmimp.Logf("result gid is: %s", saga.Gid)
 		dtmimp.FatalIfError(err)
diff --git a/test/dtmsvr_test.go b/test/dtmsvr_test.go
index fbd1c5f..6bc9e80 100644
--- a/test/dtmsvr_test.go
+++ b/test/dtmsvr_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/assert"
 	"github.com/yedf/dtm/common"
+	"github.com/yedf/dtm/dtmcli"
 	"github.com/yedf/dtm/dtmcli/dtmimp"
 	"github.com/yedf/dtm/dtmsvr"
 	"github.com/yedf/dtm/examples"
@@ -48,7 +49,7 @@ func assertSucceed(t *testing.T, gid string) {
 func TestUpdateBranchAsync(t *testing.T) {
 	common.DtmConfig.UpdateBranchSync = 0
 	saga := genSaga1(dtmimp.GetFuncName(), false, false)
-	saga.SetOptions(&dtmimp.TransOptions{WaitResult: true})
+	saga.SetOptions(&dtmcli.TransOptions{WaitResult: true})
 	err := saga.Submit()
 	assert.Nil(t, err)
 	waitTransProcessed(saga.Gid)
diff --git a/test/saga_options_test.go b/test/saga_options_test.go
index 8d11d08..a814e5a 100644
--- a/test/saga_options_test.go
+++ b/test/saga_options_test.go
@@ -55,7 +55,7 @@ func TestSagaOptionsTimeout(t *testing.T) {
 
 func TestSagaOptionsNormalWait(t *testing.T) {
 	saga := genSaga(dtmimp.GetFuncName(), false, false)
-	saga.SetOptions(&dtmimp.TransOptions{WaitResult: true})
+	saga.SetOptions(&dtmcli.TransOptions{WaitResult: true})
 	err := saga.Submit()
 	assert.Nil(t, err)
 	waitTransProcessed(saga.Gid)
@@ -66,7 +66,7 @@ func TestSagaOptionsNormalWait(t *testing.T) {
 func TestSagaOptionsCommittedOngoingWait(t *testing.T) {
 	saga := genSaga(dtmimp.GetFuncName(), false, false)
 	examples.MainSwitch.TransOutResult.SetOnce(dtmcli.ResultOngoing)
-	saga.SetOptions(&dtmimp.TransOptions{WaitResult: true})
+	saga.SetOptions(&dtmcli.TransOptions{WaitResult: true})
 	err := saga.Submit()
 	assert.Error(t, err)
 	assert.Equal(t, []string{StatusPrepared, StatusPrepared, StatusPrepared, StatusPrepared}, getBranchesStatus(saga.Gid))
@@ -79,7 +79,7 @@ func TestSagaOptionsCommittedOngoingWait(t *testing.T) {
 
 func TestSagaOptionsRollbackWait(t *testing.T) {
 	saga := genSaga(dtmimp.GetFuncName(), false, true)
-	saga.SetOptions(&dtmimp.TransOptions{WaitResult: true})
+	saga.SetOptions(&dtmcli.TransOptions{WaitResult: true})
 	err := saga.Submit()
 	assert.Error(t, err)
 	waitTransProcessed(saga.Gid)