state: drop kill and Die method names

state/unit.go

Index: state/unit.go
=== modified file 'state/unit.go'
--- state/unit.go	2012-09-21 18:26:46 +0000
+++ state/unit.go	2012-09-21 20:31:39 +0000
@@ -149,10 +149,10 @@
 	return nil
 }
 
-// Kill sets the unit lifecycle to Dying if it is Alive.
+// EnsureDying sets the unit lifecycle to Dying if it is Alive.
 // It does nothing otherwise.
-func (u *Unit) Kill() error {
-	err := ensureLife(u.st, u.st.units, u.doc.Name, Dying, "unit")
+func (u *Unit) EnsureDying() error {
+	err := ensureDying(u.st, u.st.units, u.doc.Name, "unit")
 	if err != nil {
 		return err
 	}
@@ -160,10 +160,10 @@
 	return nil
 }
 
-// Die sets the unit lifecycle to Dead if it is Alive or Dying.
+// EnsureDead sets the unit lifecycle to Dead if it is Alive or Dying.
 // It does nothing otherwise.
-func (u *Unit) Die() error {
-	err := ensureLife(u.st, u.st.units, u.doc.Name, Dead, "unit")
+func (u *Unit) EnsureDead() error {
+	err := ensureDead(u.st, u.st.units, u.doc.Name, "unit", nil, "")
 	if err != nil {
 		return err
 	}