ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-14 17:41:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ted/fix-huck' into release/next-sys

Browse Source
This commit is contained in:
Philip Monk 2020-07-21 17:08:01 -07:00
commit 753ccf1b7e
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/arvo/sys/vane/behn.hoon
View File

@ -75,9 +75,9 @@
:: Useful if you want to continue working after other moves finish. :: Useful if you want to continue working after other moves finish.
:: ::
++ huck ++ huck
|= mov=vase |= syn=sign-arvo
=< [moves state] =< [moves state]
event-core(moves [duct %give %meta mov]~) event-core(moves [duct %give %heck syn]~)
:: +drip: XX :: +drip: XX
:: ::
++ drip ++ drip
@ -286,7 +286,7 @@
%crud (crud:event-core [p q]:task) %crud (crud:event-core [p q]:task)
%rest (rest:event-core date=p.task) %rest (rest:event-core date=p.task)
%drip (drip:event-core move=p.task) %drip (drip:event-core move=p.task)
%huck (huck:event-core move=p.task) %huck (huck:event-core syn.task)
%trim trim:event-core %trim trim:event-core
%vega vega:event-core %vega vega:event-core
%wait (wait:event-core date=p.task) %wait (wait:event-core date=p.task)

25
pkg/arvo/sys/vane/gall.hoon
View File

@ -199,9 +199,7 @@
(mean >mote.u.dud< tang.u.dud) (mean >mote.u.dud< tang.u.dud)
?: =(/sys/lyv wire) ?: =(/sys/lyv wire)
(molt duct ~) (molt duct ~)
:: TODO: test this or remove and assert /sys/lyv (molt duct `[duct %pass wire %b %huck sign])
::
(molt duct `[duct %pass wire %b %huck !>(sign)])
:: ::
++ load ++ load
|^ |^
@ -757,14 +755,13 @@
:: ::
++ mo-handle-use ++ mo-handle-use
~/ %mo-handle-use ~/ %mo-handle-use
|= [=path hin=(hypo sign-arvo)] |= [=path =sign-arvo]
^+ mo-core ^+ mo-core
:: ::
?. ?=([@ @ *] path) ?. ?=([@ @ *] path)
~& [%mo-handle-use-bad-path path] ~& [%mo-handle-use-bad-path path]
!! !!
:: ::
=/ =sign-arvo q.hin
?. ?=([?(%g %b) %unto *] sign-arvo) ?. ?=([?(%g %b) %unto *] sign-arvo)
=/ app =/ app
=/ =term i.path =/ =term i.path
@ -1514,7 +1511,7 @@
=. ap-core =. ap-core
(ap-pass wire %agent dock %leave ~) (ap-pass wire %agent dock %leave ~)
=/ way [%out (scot %p p.dock) q.dock wire] =/ way [%out (scot %p p.dock) q.dock wire]
(ap-pass way %arvo %b %huck !>([%unto %kick ~])) (ap-pass way %arvo %b %huck `sign-arvo`[%g %unto %kick ~])
:: +ap-mule: run virtualized with intercepted scry, preserving type :: +ap-mule: run virtualized with intercepted scry, preserving type
:: ::
:: Compare +mute and +mule. Those pass through scry, which :: Compare +mute and +mule. Those pass through scry, which
@ -1742,7 +1739,7 @@
:: ::
++ take ++ take
~/ %gall-take ~/ %gall-take
|= [=wire =duct dud=(unit goof) hin=(hypo sign-arvo)] |= [=wire =duct dud=(unit goof) typ=type syn=sign-arvo]
^- [(list move) _gall-payload] ^- [(list move) _gall-payload]
?^ dud ?^ dud
~&(%gall-take-dud ((slog tang.u.dud) [~ gall-payload])) ~&(%gall-take-dud ((slog tang.u.dud) [~ gall-payload]))
@ -1750,13 +1747,11 @@
[~ gall-payload] [~ gall-payload]
:: ::
~| [%gall-take-failed wire] ~| [%gall-take-failed wire]
::
?> ?=([?(%sys %use) *] wire) ?> ?=([?(%sys %use) *] wire)
=/ mo-core (mo-abed:mo duct) =< mo-abet
=/ =sign-arvo q.hin %. [t.wire ?:(?=([%b %heck *] syn) syn.syn syn)]
=> ?- i.wire ?- i.wire
%sys (mo-handle-sys:mo-core t.wire sign-arvo) %sys mo-handle-sys:(mo-abed:mo duct)
%use (mo-handle-use:mo-core t.wire hin) %use mo-handle-use:(mo-abed:mo duct)
== ==
mo-abet
-- --

3
pkg/arvo/sys/zuse.hoon
View File

@ -795,6 +795,7 @@
$% [%doze p=(unit @da)] :: next alarm $% [%doze p=(unit @da)] :: next alarm
[%wake error=(unit tang)] :: wakeup or failed [%wake error=(unit tang)] :: wakeup or failed
[%meta p=vase] [%meta p=vase]
[%heck syn=sign-arvo] :: response to %huck
== ==
++ task :: in request ->$ ++ task :: in request ->$
$~ [%vega ~] :: $~ [%vega ~] ::
@ -802,7 +803,7 @@
$>(%crud vane-task) :: error with trace $>(%crud vane-task) :: error with trace
[%rest p=@da] :: cancel alarm [%rest p=@da] :: cancel alarm
[%drip p=vase] :: give in next event [%drip p=vase] :: give in next event
[%huck p=vase] :: give back [%huck syn=sign-arvo] :: give back
$>(%trim vane-task) :: trim state $>(%trim vane-task) :: trim state
$>(%vega vane-task) :: report upgrade $>(%vega vane-task) :: report upgrade
[%wait p=@da] :: set alarm [%wait p=@da] :: set alarm