urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-01 06:35:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/huck-hotfix'

Browse Source
This commit is contained in:
Matilde Park 2020-07-22 14:31:09 -04:00
commit 038a36dbb1
3 changed files with 21 additions and 20 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.
::
++ huck
|= mov=vase
|= syn=sign-arvo
=< [moves state]
event-core(moves [duct %give %meta mov]~)
event-core(moves [duct %give %heck syn]~)
:: +drip: XX
::
++ drip
@ -286,7 +286,7 @@
%crud (crud:event-core [p q]:task)
%rest (rest:event-core date=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
%vega vega:event-core
%wait (wait:event-core date=p.task)

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

@ -199,9 +199,7 @@
(mean >mote.u.dud< tang.u.dud)
?: =(/sys/lyv wire)
(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
|^
@ -622,7 +620,12 @@
%+ roll nex
|= [[=care:clay =^path] cor=_mo-core]
^+ cor
?> =(%a care)
:: We throw away %z results because we only have them to guarantee
:: molting. Clay will tell us if e.g. changing hoon.hoon affects
:: the result of a particular app (usually it will).
::
?. =(%a care)
cor
=/ dap dap:;;([%app dap=@tas %hoon ~] path)
=/ rag (mo-scry-agent-cage dap p.sign-arvo)
?: ?=(%| -.rag)
@ -752,14 +755,13 @@
::
++ mo-handle-use
~/ %mo-handle-use
|= [=path hin=(hypo sign-arvo)]
|= [=path =sign-arvo]
^+ mo-core
::
?. ?=([@ @ *] path)
~& [%mo-handle-use-bad-path path]
!!
::
=/ =sign-arvo q.hin
?. ?=([?(%g %b) %unto *] sign-arvo)
=/ app
=/ =term i.path
@ -1509,7 +1511,7 @@
=. ap-core
(ap-pass wire %agent dock %leave ~)
=/ 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
::
:: Compare +mute and +mule. Those pass through scry, which
@ -1737,7 +1739,7 @@
::
++ 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]
?^ dud
~&(%gall-take-dud ((slog tang.u.dud) [~ gall-payload]))
@ -1745,13 +1747,11 @@
[~ gall-payload]
::
~| [%gall-take-failed wire]
::
?> ?=([?(%sys %use) *] wire)
=/ mo-core (mo-abed:mo duct)
=/ =sign-arvo q.hin
=> ?- i.wire
%sys (mo-handle-sys:mo-core t.wire sign-arvo)
%use (mo-handle-use:mo-core t.wire hin)
==
mo-abet
=< mo-abet
%. [t.wire ?:(?=([%b %heck *] syn) syn.syn syn)]
?- i.wire
%sys mo-handle-sys:(mo-abed:mo duct)
%use mo-handle-use:(mo-abed:mo duct)
==
--

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

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