add fork const

plugin/dapp/trade/executor/exec_test.go

@@ -70,7 +70,7 @@ func TestTrade_Exec_SellLimit(t *testing.T) {
 
 	env := execEnv{
 		1539918074,
-		types.GetDappFork("trade", "ForkTradeAsset"),
+		types.GetDappFork("trade", pty.ForkTradeAssetX),
 		2,
 		1539918074,
 		"hash",
@@ -212,7 +212,7 @@ func TestTrade_Exec_BuyLimit(t *testing.T) {
 
 	env := execEnv{
 		1539918074,
-		types.GetDappFork("trade", "ForkTradeAsset"),
+		types.GetDappFork("trade", pty.ForkTradeAssetX),
 		2,
 		1539918074,
 		"hash",

plugin/dapp/trade/executor/util.go

@@ -35,7 +35,7 @@ func GetExecSymbol(order *pt.SellOrder) (string, string) {
 }
 
 func checkAsset(height int64, exec, symbol string) bool {
-	if types.IsDappFork(height, pt.TradeX, "ForkTradeAsset") {
+	if types.IsDappFork(height, pt.TradeX, pt.ForkTradeAssetX) {
 		if exec == "" || symbol == "" {
 			return false
 		}
@@ -48,7 +48,7 @@ func checkAsset(height int64, exec, symbol string) bool {
 }
 
 func createAccountDB(height int64, db db.KV, exec, symbol string) (*account.DB, error) {
-	if types.IsDappFork(height, pt.TradeX, "ForkTradeAsset") {
+	if types.IsDappFork(height, pt.TradeX, pt.ForkTradeAssetX) {
 		return account.NewAccountDB(exec, symbol, db)
 	}
 

plugin/dapp/trade/types/const.go

@@ -82,3 +82,8 @@ const (
 	//InvalidStartTime :
 	InvalidStartTime = 0
 )
+
+const (
+	ForkTradeAssetX = "ForkTradeAsset"
+	ForkTradeBuyLimitX = "ForkTradeBuyLimit"
+)

plugin/dapp/trade/types/trade.go

@@ -52,8 +52,8 @@ func init() {
 	types.AllowUserExec = append(types.AllowUserExec, []byte(TradeX))
 	types.RegistorExecutor(TradeX, newType())
 	types.RegisterDappFork(TradeX, "Enable", 100899)
-	types.RegisterDappFork(TradeX, "ForkTradeBuyLimit", 301000)
-	types.RegisterDappFork(TradeX, "ForkTradeAsset", 1010000)
+	types.RegisterDappFork(TradeX, ForkTradeBuyLimitX, 301000)
+	types.RegisterDappFork(TradeX, ForkTradeAssetX, 1010000)
 }
 
 type tradeType struct {