feat: prevent duplicate active orders

fixes #531

Author: boz

go.mod

@@ -24,6 +24,7 @@ require (
 	github.com/lithammer/shortuuid v1.0.1-0.20190319200910-1be5ab5d90f6
 	github.com/magiconair/properties v1.8.2-0.20191019074931-a586bb8b7dea // indirect
 	github.com/mattn/go-runewidth v0.0.6 // indirect
+	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rakyll/statik v0.1.7
 	github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 // indirect

x/deployment/handler/endblock.go

@@ -25,10 +25,11 @@ func OnEndBlock(ctx sdk.Context, keeper keeper.Keeper, mkeeper MarketKeeper) {
 				continue
 			}
 
-			// TODO: check for active order.
-
 			// create order.
-			mkeeper.CreateOrder(ctx, group.ID(), group.GroupSpec)
+			if _, err := mkeeper.CreateOrder(ctx, group.ID(), group.GroupSpec); err != nil {
+				ctx.Logger().With("group", group.ID(), "error", err).Error("creating order")
+				continue
+			}
 
 			// set state to ordered
 			keeper.OnOrderCreated(ctx, group)

x/deployment/handler/keepers.go

@@ -8,6 +8,6 @@ import (
 
 // MarketKeeper Interface includes market methods
 type MarketKeeper interface {
-	CreateOrder(ctx sdk.Context, id types.GroupID, spec types.GroupSpec) mtypes.Order
+	CreateOrder(ctx sdk.Context, id types.GroupID, spec types.GroupSpec) (mtypes.Order, error)
 	OnGroupClosed(ctx sdk.Context, id types.GroupID)
 }

x/market/keeper/keeper.go

@@ -5,6 +5,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	dtypes "github.com/ovrclk/akash/x/deployment/types"
 	"github.com/ovrclk/akash/x/market/types"
+	"github.com/pkg/errors"
 )
 
 const (
@@ -29,15 +30,24 @@ func (k Keeper) Codec() *codec.Codec {
 }
 
 // CreateOrder creates a new order with given group id and specifications. It returns created order
-func (k Keeper) CreateOrder(ctx sdk.Context, gid dtypes.GroupID, spec dtypes.GroupSpec) types.Order {
+func (k Keeper) CreateOrder(ctx sdk.Context, gid dtypes.GroupID, spec dtypes.GroupSpec) (types.Order, error) {
 	store := ctx.KVStore(k.skey)
 
 	oseq := uint32(1)
-	k.WithOrdersForGroup(ctx, gid, func(types.Order) bool {
+	var err error
+
+	k.WithOrdersForGroup(ctx, gid, func(order types.Order) bool {
+		if err = order.ValidateInactive(); err != nil {
+			return true
+		}
 		oseq++
 		return false
 	})
 
+	if err != nil {
+		return types.Order{}, errors.Wrap(err, "create order: active order exists")
+	}
+
 	order := types.Order{
 		OrderID: types.MakeOrderID(gid, oseq),
 		Spec:    spec,
@@ -54,7 +64,7 @@ func (k Keeper) CreateOrder(ctx sdk.Context, gid dtypes.GroupID, spec dtypes.Gro
 	ctx.EventManager().EmitEvent(
 		types.EventOrderCreated{ID: order.ID()}.ToSDKEvent(),
 	)
-	return order
+	return order, nil
 }
 
 // CreateBid creates a bid for a order with given orderID, price for bid and provider

x/market/keeper/keeper_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ovrclk/akash/sdl"
 	dtypes "github.com/ovrclk/akash/x/deployment/types"
 	"github.com/ovrclk/akash/x/market/types"
+	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -69,7 +70,8 @@ func (s *TestSuite) TestKeeper() {
 
 	if len(groups) > 0 {
 		s.T().Log("verify create order")
-		order := s.keeper.CreateOrder(s.ctx, groups[0].GroupID, groups[0].GroupSpec)
+		order, err := s.keeper.CreateOrder(s.ctx, groups[0].GroupID, groups[0].GroupSpec)
+		require.NoError(s.T(), err)
 		_, ok := s.keeper.GetOrder(s.ctx, order.ID())
 		s.Require().True(ok, "Order not created")
 

x/market/types/types.go

@@ -64,6 +64,17 @@ func (o Order) ValidateCanBid() error {
 	}
 }
 
+func (o Order) ValidateInactive() error {
+	switch o.State {
+	case OrderClosed:
+		return nil
+	case OrderMatched:
+		return fmt.Errorf("order matched")
+	default:
+		return fmt.Errorf("order open")
+	}
+}
+
 // Price method returns price of specific order
 func (o Order) Price() sdk.Coin {
 	return o.Spec.Price()