From 641326ad362a9b4276258df92cbf86b600c7029f Mon Sep 17 00:00:00 2001 From: ~wicrum-wicrun <99811688+wicrum-wicrun@users.noreply.github.com> Date: Mon, 24 Apr 2023 16:23:09 +0200 Subject: [PATCH] ames,lull: remove `.siz` from `$meow` --- pkg/arvo/app/dbug.hoon | 2 +- pkg/arvo/sys/lull.hoon | 8 +------- pkg/arvo/sys/vane/ames.hoon | 3 --- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkg/arvo/app/dbug.hoon b/pkg/arvo/app/dbug.hoon index e71237a39..13d144f66 100644 --- a/pkg/arvo/app/dbug.hoon +++ b/pkg/arvo/app/dbug.hoon @@ -844,7 +844,7 @@ :- 'meow' %- pairs :~ 'num'^(numb num) - 'size'^(numb siz) + 'size'^(numb (met 3 dat)) == == :: 'num-fragments'^(numb num-fragments) diff --git a/pkg/arvo/sys/lull.hoon b/pkg/arvo/sys/lull.hoon index 9bcfbc241..12f320d3b 100644 --- a/pkg/arvo/sys/lull.hoon +++ b/pkg/arvo/sys/lull.hoon @@ -1335,7 +1335,6 @@ +$ meow :: response fragment $: sig=@ux :: signature num=@ud :: number of fragments - siz=@ud :: official size of this fragment dat=@ux :: contents == :: @@ -1657,14 +1656,9 @@ :: ++ sift-meow |= =yowl - =; =meow - ~| %fine-meow-len^meow - ?> (gte siz.meow (met 3 dat.meow)) - meow :* sig=(cut 3 [0 64] yowl) num=(cut 3 [64 4] yowl) - siz=(cut 3 [68 2] yowl) - dat=(rsh 3^70 yowl) + dat=(rsh 3^68 yowl) == :: +etch-shot: serialize a packet into a bytestream :: diff --git a/pkg/arvo/sys/vane/ames.hoon b/pkg/arvo/sys/vane/ames.hoon index 94493f89c..7c8233196 100644 --- a/pkg/arvo/sys/vane/ames.hoon +++ b/pkg/arvo/sys/vane/ames.hoon @@ -337,7 +337,6 @@ |= =meow :* sig=`@q`(mug sig.meow) num=num.meow - siz=siz.meow dat=`@q`(mug dat.meow) == :: @@ -349,7 +348,6 @@ =/ wid (met 3 dat) :* sig=(sign-fra path num dat) :: fragment signature num=tot :: number of fragments - siz=?:(=(num tot) (met 3 dat) 1.024) :: fragment byte width dat=dat :: response data fragment == :: @@ -359,7 +357,6 @@ %+ can 3 :~ 64^sig.meow 4^num.meow - 2^siz.meow (met 3 dat.meow)^dat.meow == ::