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

ames: fix 4-to-5 state migration

Browse Source
This commit is contained in:
yosoyubik 2022-05-09 14:13:51 +02:00
parent 02806f63a1
commit 5d6b2d8997
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -927,13 +927,12 @@
[%adult state=_ames-state.adult-gate] [%adult state=_ames-state.adult-gate]
== == == == == ==
?- old ?- 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 *] [%4 %larva *]
~> %slog.1^leaf/"ames: larva: load" =. state.old (state-4-to-5:load:adult-core state.old)
=. queued-events events.old $(-.old %5)
=. adult-gate (load:adult-core %4 state.old)
larval-gate
:: ::
[%5 %adult *] [%5 %adult *]
=. cached-state `[%5 state.old] =. cached-state `[%5 state.old]
@ -1027,19 +1026,13 @@
:: +load: load in old state after reload :: +load: load in old state after reload
:: ::
++ load ++ load
=< |= $= old-state =< |= old-state=[%6 ^ames-state]
$% [%4 ames-state-4]
[%5 ames-state-5]
[%6 ^ames-state]
==
^+ ames-gate ^+ ames-gate
=? old-state ?=(%4 -.old-state) %5^(state-4-to-5 +.old-state)
:: XX this would crash with ames-state-5 but load is never
:: called with it -- the upgrade is handled by the larval load
::
?> ?=(%6 -.old-state) ?> ?=(%6 -.old-state)
ames-gate(ames-state +.old-state) ames-gate(ames-state +.old-state)
|% |%
:: +state-4-to-5 called from larval-ames
::
++ state-4-to-5 ++ state-4-to-5
|= ames-state=ames-state-4 |= ames-state=ames-state-4
^- ames-state-4 ^- ames-state-4
@ -1056,6 +1049,7 @@
message-pump-state message-pump-state
ship-state ship-state
ames-state ames-state
:: +state-5-to-6 called from larval-ames
:: ::
++ state-5-to-6 ++ state-5-to-6
|= ames-state=ames-state-5 |= ames-state=ames-state-5