From c38222de9f9969d2f7183d244b1842d915637c94 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 11 Feb 2020 16:12:37 -0800 Subject: [PATCH] test: updates vane calling convention --- pkg/arvo/tests/sys/vane/ames.hoon | 8 ++++---- pkg/arvo/tests/sys/vane/clay.hoon | 8 ++++---- pkg/arvo/tests/sys/vane/eyre.hoon | 12 ++++++------ pkg/arvo/tests/sys/vane/ford.hoon | 8 ++++---- pkg/arvo/tests/sys/vane/gall.hoon | 2 +- pkg/arvo/tests/sys/vane/iris.hoon | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/arvo/tests/sys/vane/ames.hoon b/pkg/arvo/tests/sys/vane/ames.hoon index f6be625e7..ae1ceb352 100644 --- a/pkg/arvo/tests/sys/vane/ames.hoon +++ b/pkg/arvo/tests/sys/vane/ames.hoon @@ -58,8 +58,8 @@ [%known peer-state] :: metamorphose :: -=> .(nec +:(call:(nec) ~[//unix] ** %born ~)) -=> .(bud +:(call:(bud) ~[//unix] ** %born ~)) +=> .(nec +:(call:(nec) ~[//unix] ~ ** %born ~)) +=> .(bud +:(call:(bud) ~[//unix] ~ ** %born ~)) :: helper core :: => @@ -90,7 +90,7 @@ :: =/ vane-core (vane(now `@da`(add ~s1 now.vane))) :: - (call:vane-core duct ** task) + (call:vane-core duct ~ ** task) :: ++ take |= [vane=_nec =wire =duct =sign:ames] @@ -98,7 +98,7 @@ :: =/ vane-core (vane(now `@da`(add ~s1 now.vane))) :: - (take:vane-core wire duct ** sign) + (take:vane-core wire duct ~ ** sign) -- :: test core :: diff --git a/pkg/arvo/tests/sys/vane/clay.hoon b/pkg/arvo/tests/sys/vane/clay.hoon index 1f3fe0d4e..d82176cb8 100644 --- a/pkg/arvo/tests/sys/vane/clay.hoon +++ b/pkg/arvo/tests/sys/vane/clay.hoon @@ -474,7 +474,7 @@ :: =/ clay-core (clay-gate our=~nul now=now eny=`@`0xdead.beef scry=scry) :: - =^ moves clay-gate (call:clay-core call-args) + =^ moves clay-gate (call:clay-core [duct ~ type wrapped-task]:call-args) :: =/ output=tang %+ expect-eq @@ -495,7 +495,7 @@ :: =/ clay-core (clay-gate our=~nul now=now eny=`@`0xdead.beef scry=scry) :: - =^ moves clay-gate (call:clay-core call-args) + =^ moves clay-gate (call:clay-core [duct ~ type wrapped-task]:call-args) :: =/ output=tang (move-comparator moves) :: @@ -513,7 +513,7 @@ :: =/ clay-core (clay-gate our=~nul now=now eny=`@`0xdead.beef scry=scry) :: - =^ moves clay-gate (take:clay-core take-args) + =^ moves clay-gate (take:clay-core [wire duct ~ wrapped-sign]:take-args) :: =/ output=tang %+ expect-eq @@ -534,7 +534,7 @@ :: =/ clay-core (clay-gate our=~nul now=now eny=`@`0xdead.beef scry=scry) :: - =^ moves clay-gate (take:clay-core take-args) + =^ moves clay-gate (take:clay-core [wire duct ~ wrapped-sign]:take-args) :: =/ output=tang (move-comparator moves) :: diff --git a/pkg/arvo/tests/sys/vane/eyre.hoon b/pkg/arvo/tests/sys/vane/eyre.hoon index 70d7fb809..19f33bd0b 100644 --- a/pkg/arvo/tests/sys/vane/eyre.hoon +++ b/pkg/arvo/tests/sys/vane/eyre.hoon @@ -1956,7 +1956,7 @@ :: =/ http-server-core (http-server-gate our=~nul now=now eny=`@uvJ`0xdead.beef scry=scry) :: - =^ moves http-server-gate (call:http-server-core call-args) + =^ moves http-server-gate (call:http-server-core [duct ~ type wrapped-task]:call-args) :: =/ output=tang %+ expect-eq @@ -1976,7 +1976,7 @@ :: =/ http-server-core (http-server-gate our=~nul now=now eny=`@uvJ`0xdead.beef scry=scry) :: - =^ moves http-server-gate (call:http-server-core call-args) + =^ moves http-server-gate (call:http-server-core [duct ~ type wrapped-task]:call-args) :: =/ output=tang (move-comparator moves) :: @@ -1986,14 +1986,14 @@ |= $: http-server-gate=_http-server-gate now=@da scry=sley - take-args=[=wire =duct wrapped-task=(hypo sign:http-server-gate)] + take-args=[=wire =duct wrapped-sign=(hypo sign:http-server-gate)] expected-moves=(list move:http-server-gate) == ^- [tang _http-server-gate] :: =/ http-server-core (http-server-gate our=~nul now=now eny=`@uvJ`0xdead.beef scry=scry) :: - =^ moves http-server-gate (take:http-server-core take-args) + =^ moves http-server-gate (take:http-server-core [wire duct ~ wrapped-sign]:take-args) :: =/ output=tang %+ expect-eq @@ -2006,14 +2006,14 @@ |= $: http-server-gate=_http-server-gate now=@da scry=sley - take-args=[=wire =duct wrapped-task=(hypo sign:http-server-gate)] + take-args=[=wire =duct wrapped-sign=(hypo sign:http-server-gate)] move-comparator=$-((list move:http-server-gate) tang) == ^- [tang _http-server-gate] :: =/ http-server-core (http-server-gate our=~nul now=now eny=`@uvJ`0xdead.beef scry=scry) :: - =^ moves http-server-gate (take:http-server-core take-args) + =^ moves http-server-gate (take:http-server-core [wire duct ~ wrapped-sign]:take-args) :: =/ output=tang (move-comparator moves) :: diff --git a/pkg/arvo/tests/sys/vane/ford.hoon b/pkg/arvo/tests/sys/vane/ford.hoon index a9de88d8a..80e8d30da 100644 --- a/pkg/arvo/tests/sys/vane/ford.hoon +++ b/pkg/arvo/tests/sys/vane/ford.hoon @@ -7264,7 +7264,7 @@ =/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry) :: =^ moves ford-gate - %- call:ford call-args + %- call:ford [duct ~ type wrapped-task]:call-args :: =/ output=tang %+ expect-eq @@ -7285,7 +7285,7 @@ =/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry) :: =^ moves ford-gate - %- take:ford take-args + %- take:ford [wire duct ~ wrapped-sign]:take-args :: =/ output=tang %+ expect-eq @@ -7310,7 +7310,7 @@ =/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry) :: =^ moves ford-gate - %- call:ford call-args + %- call:ford [duct ~ type wrapped-task]:call-args :: =/ output=tang (move-comparator moves) :: @@ -7329,7 +7329,7 @@ =/ ford (ford-gate our=~nul now=now eny=`@`0xdead.beef scry=scry) :: =^ moves ford-gate - %- take:ford take-args + %- take:ford [wire duct ~ wrapped-sign]:take-args :: =/ output=tang (move-comparator moves) :: diff --git a/pkg/arvo/tests/sys/vane/gall.hoon b/pkg/arvo/tests/sys/vane/gall.hoon index f517f4977..3dc70c604 100644 --- a/pkg/arvo/tests/sys/vane/gall.hoon +++ b/pkg/arvo/tests/sys/vane/gall.hoon @@ -69,7 +69,7 @@ :: =/ gall-core (gall-gate our=~nec now=now eny=`@`0xdead.beef scry=scry) :: - =^ moves gall-gate (call:gall-core call-args) + =^ moves gall-gate (call:gall-core [duct ~ type wrapped-task]:call-args) :: =/ output=tang %+ expect-eq diff --git a/pkg/arvo/tests/sys/vane/iris.hoon b/pkg/arvo/tests/sys/vane/iris.hoon index b28029cb6..b706bfce2 100644 --- a/pkg/arvo/tests/sys/vane/iris.hoon +++ b/pkg/arvo/tests/sys/vane/iris.hoon @@ -523,7 +523,7 @@ =/ http-client-core (http-client-gate our=~nul now=now eny=`@uvJ`0xdead.beef scry=scry) :: - =^ moves http-client-gate (call:http-client-core call-args) + =^ moves http-client-gate (call:http-client-core [duct ~ type wrapped-task]:call-args) :: =/ output=tang %+ expect-eq