From 3c2daa06b4e51c5db0d89d4ebe52f5e20da89bd5 Mon Sep 17 00:00:00 2001 From: drbeefsupreme Date: Thu, 10 Jun 2021 15:34:42 -0400 Subject: [PATCH] naive: match %configure-keys to skim:tx format --- pkg/arvo/lib/naive-transactions.hoon | 2 +- pkg/arvo/tests/lib/naive.hoon | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/arvo/lib/naive-transactions.hoon b/pkg/arvo/lib/naive-transactions.hoon index 45e8c57b34..524be17693 100644 --- a/pkg/arvo/lib/naive-transactions.hoon +++ b/pkg/arvo/lib/naive-transactions.hoon @@ -101,7 +101,7 @@ == :: ++ get-keys - |= [suite=@ud crypt=@ auth=@ breach=?] ^- octs + |= [crypt=@ auth=@ suite=@ breach=?] ^- octs %: cad:naive 3 (from-proxy proxy.from.tx) 4^ship.from.tx diff --git a/pkg/arvo/tests/lib/naive.hoon b/pkg/arvo/tests/lib/naive.hoon index a5962412fc..f265437ed9 100644 --- a/pkg/arvo/tests/lib/naive.hoon +++ b/pkg/arvo/tests/lib/naive.hoon @@ -496,7 +496,7 @@ ?+ tx-type.event !! :: %spawn :: %transfer-point - :: %configure-keys + :: %configure-keys [%configure-keys encr auth 1 |] :: %escape :: %cancel-escape :: %adopt @@ -729,7 +729,7 @@ -- :: ++ test-marbud-l2-change-keys-new ^- tang - =/ new-keys [%configure-keys suit encr auth |] + =/ new-keys [%configure-keys encr auth suit |] =| =^state:naive =^ f state (init-marbud state) =/ marbud-point (~(got by points.state) ~marbud) @@ -1016,8 +1016,9 @@ =^ f state (n state %bat q:(gen-tx 0 lt-spawn-1 %marbud-skey)) state :: +:: ++ test-marbud-l2-change-keys ^- tang - =/ new-keys [%configure-keys suit encr auth |] + =/ new-keys [%configure-keys encr auth suit |] =/ marbud-mproxy [marbud-own %set-management-proxy (addr %marbud-mkey)] :: ;: weld @@ -1045,7 +1046,7 @@ :: :: TODO: transfer breach via transfer proxy ++ test-marbud-l2-proxies-transfer ^- tang - =/ marbud-new-keys [marbud-own %configure-keys suit encr auth |] + =/ marbud-new-keys [marbud-own %configure-keys encr auth suit |] =/ marbud-sproxy [marbud-own %set-spawn-proxy (addr %marbud-skey)] =/ marbud-mproxy [marbud-own %set-management-proxy (addr %marbud-mkey)] =/ marbud-tproxy [marbud-own %set-transfer-proxy (addr %marbud-key-1)] @@ -1124,8 +1125,8 @@ :: TODO: life+rift changes via transfer proxy :: ++ test-marbud-life-rift ^- tang - =/ new-keys-no-reset [marbud-own %configure-keys suit encr auth |] - =/ new-keys-yes-reset [marbud-own %configure-keys suit encr auth &] + =/ new-keys-no-reset [marbud-own %configure-keys encr auth suit |] + =/ new-keys-yes-reset [marbud-own %configure-keys encr auth suit &] =/ zero-keys-no-reset [marbud-own %configure-keys 0 0 0 |] =/ zero-keys-yes-reset [marbud-own %configure-keys 0 0 0 &] =/ marbud-transfer-no-breach [marbud-own %transfer-point (addr %marbud-key-1) |]