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

Merge branch 'yu/ames-fixes' into yu/gall-cork-wip

Browse Source
This commit is contained in:
yosoyubik 2022-05-09 14:16:07 +02:00
commit a2b771f704
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/arvo/sys/vane/ames.hoon
View File

@ -966,13 +966,12 @@
[%adult state=_ames-state.adult-gate]
== == ==
?- old
[%4 %adult *] (load:adult-core %4 state.old)
[%4 %adult *]
$(old [%5 %adult (state-4-to-5:load:adult-core state.old)])
::
[%4 %larva *]
~> %slog.1^leaf/"ames: larva: load"
=. queued-events events.old
=. adult-gate (load:adult-core %4 state.old)
larval-gate
=. state.old (state-4-to-5:load:adult-core state.old)
$(-.old %5)
::
[%5 %adult *] (load:adult-core %5 state.old)
::
@ -1076,23 +1075,14 @@
:: +load: load in old state after reload
::
++ load
=< |= $= old-state
$% [%4 ames-state-4]
[%5 ames-state-5]
[%6 ames-state-6]
[%7 ^ames-state]
==
=< |= old-state=[%6 ^ames-state]
^+ ames-gate
=? old-state ?=(%4 -.old-state) %5^(state-4-to-5 +.old-state)
=? old-state ?=(%5 -.old-state) %6^(state-5-to-6 +.old-state)
?< ?=(%6 -.old-state)
:: XX this would crash with ames-state-6 but load is never
:: called with it -- the upgrade is handled by the larval load
::
?> ?=(%7 -.old-state)
?> ?=(%6 -.old-state)
ames-gate(ames-state +.old-state)
::
|%
:: +state-4-to-5 called from larval-ames
::
++ state-4-to-5
|= ames-state=ames-state-4
^- ames-state-5
@ -1109,6 +1099,7 @@
message-pump-state
ship-state
ames-state
:: +state-5-to-6 called from larval-ames
::
++ state-5-to-6
|= ames-state=ames-state-5