From ca4989784dce66a5e0803f5707e0cde85adebb27 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 20 Nov 2018 23:06:27 -0500 Subject: [PATCH] updates single-homing and legacy boot event conform to current release-candidate expectations --- vere/pier.c | 18 ++++++++---------- vere/serf.c | 11 ++++++----- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/vere/pier.c b/vere/pier.c index 6801651a6c..1ba8bb397c 100644 --- a/vere/pier.c +++ b/vere/pier.c @@ -950,13 +950,14 @@ _pier_disk_consolidate(u3_pier* pir_u, /* prepend identity event to module sequence */ - { - u3_noun wir = u3nt(c3__name, u3dc("scot", 'p', u3k(who)), u3_nul); - u3_noun car = u3nc(c3__veal, u3k(who)); - u3_noun ovo = u3nc(wir, car); + // { + // u3_noun wir = u3nt(c3__name, u3dc("scot", 'p', u3k(who)), u3_nul); + // u3_noun car = u3nc(c3__veal, u3k(who)); + // u3_noun ovo = u3nc(wir, car); - seq = u3nc(ovo, u3k(mod)); - } + // seq = u3nc(ovo, u3k(mod)); + // } + seq = mod; /* insert with timestamp */ @@ -982,10 +983,7 @@ _pier_disk_consolidate(u3_pier* pir_u, */ { u3_noun wir = u3nq(u3_blip, c3__term, '1', u3_nul); - u3_noun car = u3nq(c3__boot, - c3__sith, - u3k(who), - u3nc(u3k(tic), u3k(sec))); + u3_noun car = u3nt(c3__boot, c3__fake, u3k(who)); ovo = u3nc(wir, car); } diff --git a/vere/serf.c b/vere/serf.c index 51a64f333c..d910bba03b 100644 --- a/vere/serf.c +++ b/vere/serf.c @@ -216,17 +216,18 @@ _serf_poke_live(c3_d evt_d, // event number // XX revise when real keys are supported // XX dispatch on evt_d, wire, or card tag? // - if ( 6ULL == evt_d ) { - // vir=[[wire %veal @p] ~] - // fec=[%veal @p] + if ( c3__boot == u3h(u3t(ovo)) ) { + // ovo=[%boot *] + // vir=[[wire %init @p] ~] + // fec=[%init @p] // u3_noun fec = u3t(u3h(vir)); - c3_assert( c3__veal == u3h(fec) ); + c3_assert( c3__init == u3h(fec) ); c3_assert( u3_none == u3A->our ); u3A->our = u3k(u3t(fec)); - u3A->fak = c3y; + u3A->fak = ( c3__fake == u3h(u3t(u3t(ovo))) ) ? c3y : c3n; { u3_noun nam = u3dc("scot", 'p', u3k(u3A->our));