Merge pull request #889 from dsurnin/hot-fix-upgrage-cmd

Hot fix upgrage cmd
hyperledger · Aug 10, 2018 · 177f151 · 177f151
2 parents c740fe3 + 8f63eaf
commit 177f151
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/indy_client/client/wallet/upgrade.py b/indy_client/client/wallet/upgrade.py
@@ -31,15 +31,12 @@ def _op(self):
             ACTION: self.action,
             SHA256: self.sha256,
             FORCE: self.force,
-            PACKAGE: self.package
+            PACKAGE: self.package,
+            SCHEDULE: self.schedule,
+            TIMEOUT: self.timeout,
+            JUSTIFICATION: self.justification,
+            REINSTALL: self.reinstall,
         }
-        if self.action == START:
-            op.update({
-                SCHEDULE: self.schedule,
-                TIMEOUT: self.timeout,
-                JUSTIFICATION: self.justification,
-                REINSTALL: self.reinstall,
-            })
 
         return op
 

diff --git a/indy_client/test/cli/test_pool_upgrade.py b/indy_client/test/cli/test_pool_upgrade.py
@@ -43,8 +43,8 @@ def poolUpgradeCancelled(poolUpgradeScheduled, be, do, trusteeCli,
     cancelUpgrade[ACTION] = CANCEL
     cancelUpgrade[JUSTIFICATION] = '"not gonna give you one"'
     be(trusteeCli)
-    do('send POOL_UPGRADE name={name} version={version} sha256={sha256} '
-       'action={action} justification={justification}',
+    do('send POOL_UPGRADE name={name} version={version} sha256={sha256} action={action} '
+       'justification={justification} schedule={schedule} timeout={timeout} ',
        within=10,
        expect=['Sending pool upgrade', 'Pool Upgrade Transaction Scheduled'],
        mapper=cancelUpgrade)