remove closing states (#176)

fixes #174
akash-network · Apr 3, 2018 · f1ce7d1 · f1ce7d1
1 parent baa56c6
commit f1ce7d1
Show file tree

Hide file tree

Showing 18 changed files with 135 additions and 734 deletions.
diff --git a/_docs/dot/tenant-cancel.dot b/_docs/dot/tenant-cancel.dot
@@ -12,9 +12,7 @@ digraph marketplace {
   "5"     [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\l"];
   "6"     [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\l"];
   "7"     [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\l"];
-  "8"     [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\lOrder: Closed\lFulfillment: Closed\lLease: Closing\l"];
-
-  "9"    [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\lLease: Closed\l"];
+  "8"     [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\lLease: Closed\l"];
 
   "0" -> "1"           [label="TxCreateDeployment"];
   "1" -> "2"           [label="TxCreateOrder"];
@@ -26,10 +24,6 @@ digraph marketplace {
   "3" -> "7"           [label="TxCloseDeployment"];
   "4" -> "8"           [label="TxCloseDeployment"];
 
-  "8" -> "9"          [label="TxCloseLease"];
-
-
   { rank=same "1", "2", "3", "4" }
   { rank=same "5", "6", "7", "8" }
-  { rank=same "9" }
 }
diff --git a/_docs/dot/tenant-cancel.svg b/_docs/dot/tenant-cancel.svg
diff --git a/_integration/cmp/deployment.go b/_integration/cmp/deployment.go
@@ -26,7 +26,7 @@ func deployCreate(key vars.Ref, daddr vars.Ref) gestalt.Component {
 }
 
 func deployClose(key vars.Ref, daddr vars.Ref) gestalt.Component {
-	check := deployQueryState(daddr, types.Deployment_CLOSING)
+	check := deployQueryState(daddr, types.Deployment_CLOSED)
 
 	return g.Group("deploy-close").
 		Run(

diff --git a/app/deployment/app.go b/app/deployment/app.go
@@ -343,14 +343,23 @@ func (a *app) doDeliverCloseTx(ctx apptypes.Context, tx *types.TxCloseDeployment
 		}
 	}
 
+	deployment.State = types.Deployment_CLOSED
+	err = a.State().Deployment().Save(deployment)
+	if err != nil {
+		return tmtypes.ResponseDeliverTx{
+			Code: code.INVALID_TRANSACTION,
+			Log:  err.Error(),
+		}
+	}
+
 	groups, err := a.State().DeploymentGroup().ForDeployment(deployment.Address)
 	if err != nil {
 		return tmtypes.ResponseDeliverTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  err.Error(),
 		}
 	}
-	if deployment == nil {
+	if groups == nil {
 		return tmtypes.ResponseDeliverTx{
 			Code: code.INVALID_TRANSACTION,
 			Log:  "Deployment groups",
@@ -365,18 +374,8 @@ func (a *app) doDeliverCloseTx(ctx apptypes.Context, tx *types.TxCloseDeployment
 		}
 	}
 
-	deployment.State = types.Deployment_CLOSED
-	groupState := types.DeploymentGroup_CLOSED
-
-	if leases != nil {
-		deployment.State = types.Deployment_CLOSING
-		groupState = types.DeploymentGroup_CLOSING
-	}
-
 	for _, group := range groups {
-		if group.State != types.DeploymentGroup_CLOSING {
-			group.State = groupState
-		}
+		group.State = types.DeploymentGroup_CLOSED
 		err = a.State().DeploymentGroup().Save(group)
 		if err != nil {
 			return tmtypes.ResponseDeliverTx{
@@ -426,7 +425,7 @@ func (a *app) doDeliverCloseTx(ctx apptypes.Context, tx *types.TxCloseDeployment
 
 	if leases != nil {
 		for _, lease := range leases {
-			lease.State = types.Lease_CLOSING
+			lease.State = types.Lease_CLOSED
 			err = a.State().Lease().Save(lease)
 			if err != nil {
 				return tmtypes.ResponseDeliverTx{
@@ -437,14 +436,6 @@ func (a *app) doDeliverCloseTx(ctx apptypes.Context, tx *types.TxCloseDeployment
 		}
 	}
 
-	err = a.State().Deployment().Save(deployment)
-	if err != nil {
-		return tmtypes.ResponseDeliverTx{
-			Code: code.INVALID_TRANSACTION,
-			Log:  err.Error(),
-		}
-	}
-
 	return tmtypes.ResponseDeliverTx{
 		Tags: apptypes.NewTags(a.Name(), apptypes.TxTypeCloseDeployment),
 	}

diff --git a/app/deployment/app_test.go b/app/deployment/app_test.go
@@ -276,7 +276,7 @@ func TestCloseTx_4(t *testing.T) {
 
 	testutil.CloseDeployment(t, app, &depl.Address, &key)
 
-	check(types.Deployment_CLOSING, types.DeploymentGroup_CLOSING, types.Order_CLOSED, types.Fulfillment_CLOSED, types.Lease_CLOSING)
+	check(types.Deployment_CLOSED, types.DeploymentGroup_CLOSED, types.Order_CLOSED, types.Fulfillment_CLOSED, types.Lease_CLOSED)
 }
 
 // check deployment and group query & status