X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=toolbar%2Ffederation%2Fdatabase%2Form%2Fcross_transaction.go;h=6c424db58ddb78e1a983f3ab11d88eba29f542b8;hp=9d2eb29700c42793e50f658504aec3468a0165d7;hb=001e399d2d0eb8f6956b844e721e2f0a4680ff90;hpb=91c664e4bf08540d413f8cdd087d436c2bae2ac6

diff --git a/toolbar/federation/database/orm/cross_transaction.go b/toolbar/federation/database/orm/cross_transaction.go
index 9d2eb297..6c424db5 100644
--- a/toolbar/federation/database/orm/cross_transaction.go
+++ b/toolbar/federation/database/orm/cross_transaction.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 
 	"github.com/vapor/errors"
-	"github.com/vapor/toolbar/federation/common"
-	"github.com/vapor/toolbar/federation/types"
+	"github.com/vapor/toolbar/common"
+	fedCommon "github.com/vapor/toolbar/federation/common"
 )
 
 type CrossTransaction struct {
@@ -25,8 +25,8 @@ type CrossTransaction struct {
 	DestTxIndex          sql.NullInt64  `sql:"default:null"`
 	DestTxHash           sql.NullString `sql:"default:null"`
 	Status               uint8
-	CreatedAt            types.Timestamp
-	UpdatedAt            types.Timestamp
+	CreatedAt            common.Timestamp
+	UpdatedAt            common.Timestamp
 
 	Chain *Chain `gorm:"foreignkey:ChainID"`
 	Reqs  []*CrossTransactionReq
@@ -35,10 +35,10 @@ type CrossTransaction struct {
 func (c *CrossTransaction) MarshalJSON() ([]byte, error) {
 	var status string
 	switch c.Status {
-	case common.CrossTxPendingStatus:
-		status = common.CrossTxPendingStatusLabel
-	case common.CrossTxCompletedStatus:
-		status = common.CrossTxCompletedStatusLabel
+	case fedCommon.CrossTxPendingStatus:
+		status = fedCommon.CrossTxPendingStatusLabel
+	case fedCommon.CrossTxCompletedStatus:
+		status = fedCommon.CrossTxCompletedStatusLabel
 	default:
 		return nil, errors.New("unknown cross-chain tx status")
 	}