Order TTL (#146)

* [ci skip] checkpt * [ci skip] checkpt * [ci skip] checkpt * bump * fix test wait
akash-network · Mar 26, 2018 · 236119c · 236119c
1 parent 3f62651
commit 236119c
Show file tree

Hide file tree

Showing 6 changed files with 188 additions and 108 deletions.
diff --git a/app/market/engine.go b/app/market/engine.go
@@ -42,9 +42,11 @@ func (e engine) processDeployments(state state.State, w txBuffer) error {
 	return nil
 }
 
+// only create leases for orders which are at or past thier EndAt
 func (e engine) processDeployment(state state.State, w txBuffer, deployment types.Deployment) error {
 
 	nextSeq := state.Deployment().SequenceFor(deployment.Address).Next()
+	height := state.Version()
 
 	// process cancel deployment
 	if deployment.State == types.Deployment_CLOSED {
@@ -70,9 +72,6 @@ func (e engine) processDeployment(state state.State, w txBuffer, deployment type
 			continue
 		}
 
-		// TODO: put ttl on orders
-		// TODO: cancel stale orders
-
 		// process current orders
 		orders, err := state.Order().ForGroup(group)
 		if err != nil {
@@ -88,9 +87,11 @@ func (e engine) processDeployment(state state.State, w txBuffer, deployment type
 			if !activeFound && order.State == types.Order_OPEN || order.State == types.Order_MATCHED {
 				activeFound = true
 			}
-			err := e.processOrder(state, w, order)
-			if err != nil {
-				return err
+			if order.EndAt <= height {
+				err := e.processOrder(state, w, order)
+				if err != nil {
+					return err
+				}
 			}
 		}
 
@@ -102,6 +103,7 @@ func (e engine) processDeployment(state state.State, w txBuffer, deployment type
 					Group:      group.GetSeq(),
 					Order:      nextSeq,
 					State:      types.Order_OPEN,
+					EndAt:      group.OrderTTL + height,
 				},
 			})
 			nextSeq++

diff --git a/app/order/app.go b/app/order/app.go
@@ -42,7 +42,7 @@ func (a *app) AcceptTx(ctx apptypes.Context, tx interface{}) bool {
 func (a *app) CheckTx(ctx apptypes.Context, tx interface{}) tmtypes.ResponseCheckTx {
 	switch tx := tx.(type) {
 	case *types.TxPayload_TxCreateOrder:
-		return a.doCheckTx(ctx, tx.TxCreateOrder)
+		return a.doCheckCreateTx(ctx, tx.TxCreateOrder)
 	}
 	return tmtypes.ResponseCheckTx{
 		Code: code.UNKNOWN_TRANSACTION,
@@ -53,7 +53,7 @@ func (a *app) CheckTx(ctx apptypes.Context, tx interface{}) tmtypes.ResponseChec
 func (a *app) DeliverTx(ctx apptypes.Context, tx interface{}) tmtypes.ResponseDeliverTx {
 	switch tx := tx.(type) {
 	case *types.TxPayload_TxCreateOrder:
-		return a.doDeliverTx(ctx, tx.TxCreateOrder)
+		return a.doDeliverCreateTx(ctx, tx.TxCreateOrder)
 	}
 	return tmtypes.ResponseDeliverTx{
 		Code: code.UNKNOWN_TRANSACTION,
@@ -145,8 +145,7 @@ func (a *app) doRangeQuery(key base.Bytes) tmtypes.ResponseQuery {
 	}
 }
 
-// todo: break each type of check out into a named global exported funtion for all trasaction types to utilize
-func (a *app) doCheckTx(ctx apptypes.Context, tx *types.TxCreateOrder) tmtypes.ResponseCheckTx {
+func (a *app) doCheckCreateTx(ctx apptypes.Context, tx *types.TxCreateOrder) tmtypes.ResponseCheckTx {
 
 	// todo: ensure signed by last block creator / valid market facilitator
 
@@ -218,9 +217,9 @@ func (a *app) doCheckTx(ctx apptypes.Context, tx *types.TxCreateOrder) tmtypes.R
 	return tmtypes.ResponseCheckTx{}
 }
 
-func (a *app) doDeliverTx(ctx apptypes.Context, tx *types.TxCreateOrder) tmtypes.ResponseDeliverTx {
+func (a *app) doDeliverCreateTx(ctx apptypes.Context, tx *types.TxCreateOrder) tmtypes.ResponseDeliverTx {
 
-	cresp := a.doCheckTx(ctx, tx)
+	cresp := a.doCheckCreateTx(ctx, tx)
 	if !cresp.IsOK() {
 		return tmtypes.ResponseDeliverTx{
 			Code: cresp.Code,

diff --git a/testutil/deployment.go b/testutil/deployment.go
@@ -107,7 +107,7 @@ func Deployment(tenant base.Bytes, nonce uint64) *types.Deployment {
 }
 
 func DeploymentGroups(deployment base.Bytes, nonce uint64) *types.DeploymentGroups {
-
+	orderTTL := int64(5)
 	nonce++
 
 	runit := types.ResourceUnit{
@@ -132,6 +132,7 @@ func DeploymentGroups(deployment base.Bytes, nonce uint64) *types.DeploymentGrou
 		Seq:          nonce,
 		Resources:    []types.ResourceGroup{rgroup},
 		Requirements: []types.ProviderAttribute{pattr},
+		OrderTTL:     orderTTL,
 	}
 
 	groups := []types.DeploymentGroup{*group}

diff --git a/testutil/wait.go b/testutil/wait.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	defaultDelayThreadStart = time.Millisecond * 2
+	defaultDelayThreadStart = time.Millisecond * 5
 )
 
 func SleepForThreadStart(t *testing.T) {