delete order id in cancel order msg

bnb-chain · Feb 2, 2019 · c654599 · c654599
1 parent 5982ca8
commit c654599
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/client/transaction/cancle_order.go b/client/transaction/cancle_order.go
@@ -12,17 +12,17 @@ type CancelOrderResult struct {
 	tx.TxCommitResult
 }
 
-func (c *client) CancelOrder(baseAssetSymbol, quoteAssetSymbol, id, refId string, sync bool) (*CancelOrderResult, error) {
+func (c *client) CancelOrder(baseAssetSymbol, quoteAssetSymbol, refId string, sync bool) (*CancelOrderResult, error) {
 	if baseAssetSymbol == "" || quoteAssetSymbol == "" {
 		return nil, fmt.Errorf("BaseAssetSymbol or QuoteAssetSymbol is missing. ")
 	}
-	if id == "" || refId == "" {
+	if refId == "" {
 		return nil, fmt.Errorf("OrderId or Order RefId is missing. ")
 	}
 
 	fromAddr := c.keyManager.GetAddr()
 
-	cancelOrderMsg := msg.NewCancelOrderMsg(fromAddr, common.CombineSymbol(baseAssetSymbol, quoteAssetSymbol), id, refId)
+	cancelOrderMsg := msg.NewCancelOrderMsg(fromAddr, common.CombineSymbol(baseAssetSymbol, quoteAssetSymbol), refId)
 	err := cancelOrderMsg.ValidateBasic()
 	if err != nil {
 		return nil, err

diff --git a/client/transaction/transaction.go b/client/transaction/transaction.go
@@ -13,7 +13,7 @@ import (
 
 type TransactionClient interface {
 	CreateOrder(baseAssetSymbol, quoteAssetSymbol string, op int8, price, quantity int64, sync bool) (*CreateOrderResult, error)
-	CancelOrder(baseAssetSymbol, quoteAssetSymbol, id, refId string, sync bool) (*CancelOrderResult, error)
+	CancelOrder(baseAssetSymbol, quoteAssetSymbol,refId string, sync bool) (*CancelOrderResult, error)
 	BurnToken(symbol string, amount int64, sync bool) (*BurnTokenResult, error)
 	ListPair(proposalId int64, baseAssetSymbol string, quoteAssetSymbol string, initPrice int64, sync bool) (*ListPairResult, error)
 	FreezeToken(symbol string, amount int64, sync bool) (*FreezeTokenResult, error)

diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -97,7 +97,7 @@ func TestAllProcess(t *testing.T) {
 
 	//---- Cancle Order  ---------
 	time2.Sleep(2 * time2.Second)
-	cancleOrderResult, err := client.CancelOrder(tradeSymbol, nativeSymbol, orderId, orderId, true)
+	cancleOrderResult, err := client.CancelOrder(tradeSymbol, nativeSymbol, orderId, true)
 	assert.NoError(t, err)
 	assert.True(t, cancleOrderResult.Ok)
 	fmt.Printf("cancleOrderResult:  %v \n", cancleOrderResult)

diff --git a/keys/keys_test.go b/keys/keys_test.go
@@ -10,7 +10,12 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func setup(){
+	types.Network = types.UnitTestNetwork
+}
+
 func TestRecoveryFromKeyWordsNoError(t *testing.T) {
+	setup()
 	mnemonic := "bottom quick strong ranch section decide pepper broken oven demand coin run jacket curious business achieve mule bamboo remain vote kid rigid bench rubber"
 	keyManger, err := NewMnemonicKeyManager(mnemonic)
 	assert.NoError(t, err)
@@ -25,6 +30,7 @@ func TestRecoveryFromKeyWordsNoError(t *testing.T) {
 }
 
 func TestRecoveryFromKeyBaseNoError(t *testing.T) {
+	setup()
 	file := "testkeystore.json"
 	planText := []byte("Test msg")
 	keyManager, err := NewKeyStoreKeyManager(file, "Zjubfd@123")
@@ -36,6 +42,7 @@ func TestRecoveryFromKeyBaseNoError(t *testing.T) {
 }
 
 func TestRecoveryPrivateKeyNoError(t *testing.T) {
+	setup()
 	planText := []byte("Test msg")
 	priv := "9579fff0cab07a4379e845a890105004ba4c8276f8ad9d22082b2acbf02d884b"
 	keyManager, err := NewPrivateKeyManager(priv)
@@ -47,6 +54,7 @@ func TestRecoveryPrivateKeyNoError(t *testing.T) {
 }
 
 func TestSignTxNoError(t *testing.T) {
+	setup()
 	test1Mnemonic := "swift slam quote sail high remain mandate sample now stamp title among fiscal captain joy puppy ghost arrow attract ozone situate install gain mean"
 	test2Mnemonic := "bottom quick strong ranch section decide pepper broken oven demand coin run jacket curious business achieve mule bamboo remain vote kid rigid bench rubber"
 
@@ -112,11 +120,11 @@ func TestSignTxNoError(t *testing.T) {
 			"Create order sign error",
 		},
 		{
-			msg.NewCancelOrderMsg(test1Addr, "BTC-86A_BNB", "1D0E3086E8E4E0A53C38A90D55BD58B34D57D2FA-5", "1D0E3086E8E4E0A53C38A90D55BD58B34D57D2FA-5"),
+			msg.NewCancelOrderMsg(test1Addr, "BTC-86A_BNB", "1D0E3086E8E4E0A53C38A90D55BD58B34D57D2FA-5"),
 			test1KeyManger,
 			0,
 			5,
-			"f301f0625dee0a7f166e681b0a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa120b4254432d3836415f424e421a2a314430453330383645384534453041353343333841393044353542443538423334443537443246412d35222a314430453330383645384534453041353343333841393044353542443538423334443537443246412d35126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c97112408ab86cb8a06db80bb7ed59e8371ff633919e0b642ae0609c44759b7cd1f4d0bf2d9f1230234dd6c02bb75d787afd37db9a6594feb93c7797569960b393d71b6b200a",
+			"c701f0625dee0a53166e681b0a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa120b4254432d3836415f424e421a2a314430453330383645384534453041353343333841393044353542443538423334443537443246412d35126c0a26eb5ae98721027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c971124026fc44b689f3e8b4abbd58a4ae9440cef2d650db191f99d2b50ff69abd5340675feb98644f64a16e5d842236b3976e17c4ba2db842bed7f4f6c4548d468977fa200a",
 			"Cancel order sign error",
 		},
 		{

diff --git a/types/account.go b/types/account.go
@@ -18,6 +18,7 @@ type ChainNetwork uint8
 const (
 	TestNetwork ChainNetwork = iota
 	ProdNetwork
+	UnitTestNetwork
 )
 
 var Network = ProdNetwork
@@ -28,6 +29,8 @@ func (this ChainNetwork) Bech32Prefixes() string {
 		return "tbnb"
 	case ProdNetwork:
 		return "bnb"
+	case UnitTestNetwork:
+		return "bnc"
 	default:
 		panic("Unknown network type")
 	}

diff --git a/types/msg/msg-order.go b/types/msg/msg-order.go
@@ -239,16 +239,14 @@ func (msg CreateOrderMsg) ValidateBasic() error {
 type CancelOrderMsg struct {
 	Sender types.AccAddress `json:"sender"`
 	Symbol string           `json:"symbol"`
-	ID     string           `json:"id"`
 	RefID  string           `json:"refid"`
 }
 
 // NewCancelOrderMsg constructs a new CancelOrderMsg
-func NewCancelOrderMsg(sender types.AccAddress, symbol, id, refID string) CancelOrderMsg {
+func NewCancelOrderMsg(sender types.AccAddress, symbol, refID string) CancelOrderMsg {
 	return CancelOrderMsg{
 		Sender: sender,
 		Symbol: symbol,
-		ID:     id,
 		RefID:  refID,
 	}
 }
@@ -286,9 +284,8 @@ func (msg CancelOrderMsg) ValidateBasic() error {
 	if len(msg.Sender) == 0 {
 		return fmt.Errorf("ErrUnknownAddress %s", msg.Sender.String())
 	}
-
-	if len(msg.ID) == 0 || !strings.Contains(msg.ID, "-") {
-		return fmt.Errorf("Invalid order ID:%s", msg.ID)
+	if len(msg.RefID) == 0 || !strings.Contains(msg.RefID, "-") {
+		return fmt.Errorf("Invalid order RefID:%s", msg.RefID)
 	}
 
 	return nil