From b5c9f4ed2a8d02d20f800cca2958d08fc0e26f15 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Sat, 3 Oct 2020 23:34:10 -0700 Subject: [PATCH 1/2] zuse: removes redundant definitions of $mite and $octs --- pkg/arvo/mar/atom.hoon | 2 +- pkg/arvo/mar/eth/txs.hoon | 2 +- pkg/arvo/mar/md.hoon | 2 +- pkg/arvo/mar/pem.hoon | 2 +- pkg/arvo/mar/pill.hoon | 2 +- pkg/arvo/mar/publish/comment.hoon | 2 +- pkg/arvo/mar/publish/info.hoon | 2 +- pkg/arvo/mar/txt.hoon | 2 +- pkg/arvo/mar/udon.hoon | 2 +- pkg/arvo/mar/umd.hoon | 2 +- pkg/arvo/sys/zuse.hoon | 6 ------ 11 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pkg/arvo/mar/atom.hoon b/pkg/arvo/mar/atom.hoon index 3dc4d17fe..a8927ee68 100644 --- a/pkg/arvo/mar/atom.hoon +++ b/pkg/arvo/mar/atom.hoon @@ -9,7 +9,7 @@ |_ ato/@ ++ grab |% ++ noun @ - ++ mime |=({* p/octs:eyre} q.p) + ++ mime |=([* p=octs] q.p) -- ++ grow |% ++ mime [/application/x-urb-unknown (as-octs ato)] diff --git a/pkg/arvo/mar/eth/txs.hoon b/pkg/arvo/mar/eth/txs.hoon index 48a447e61..f22c5dd09 100644 --- a/pkg/arvo/mar/eth/txs.hoon +++ b/pkg/arvo/mar/eth/txs.hoon @@ -16,7 +16,7 @@ ++ grab |% ++ mime - |= [p=mite:eyre q=octs:eyre] + |= (pair mite octs) =/ wan=wain (to-wain q.q) ?> ?=(^ wan) %+ murn t.wan diff --git a/pkg/arvo/mar/md.hoon b/pkg/arvo/mar/md.hoon index 53051fe5b..ab1629ed4 100644 --- a/pkg/arvo/mar/md.hoon +++ b/pkg/arvo/mar/md.hoon @@ -9,7 +9,7 @@ :: ++ grab :: convert from |% - ++ mime |=({p/mite:eyre q/octs:eyre} (to-wain q.q)) + ++ mime |=((pair mite octs) (to-wain q.q)) ++ noun wain :: clam from %noun -- ++ grow diff --git a/pkg/arvo/mar/pem.hoon b/pkg/arvo/mar/pem.hoon index 71be03960..4899b8b95 100644 --- a/pkg/arvo/mar/pem.hoon +++ b/pkg/arvo/mar/pem.hoon @@ -6,7 +6,7 @@ :: ++ grab :: convert from |% - ++ mime |=([p=mite:eyre q=octs:eyre] (to-wain q.q)) + ++ mime |=((pair mite octs) (to-wain q.q)) ++ noun wain :: clam from %noun -- ++ grow diff --git a/pkg/arvo/mar/pill.hoon b/pkg/arvo/mar/pill.hoon index 15c0cdf6d..6d69bd167 100644 --- a/pkg/arvo/mar/pill.hoon +++ b/pkg/arvo/mar/pill.hoon @@ -13,7 +13,7 @@ |% ++ noun pill ++ mime - |= [p=mite:eyre q=octs:eyre] + |= (pair mite octs) =+ o=(pair ,* ,*) :: ,*) =+ (,[boot-ova=* kernel-ova=(list o) userspace-ova=(list o)] (cue q.q)) =/ convert diff --git a/pkg/arvo/mar/publish/comment.hoon b/pkg/arvo/mar/publish/comment.hoon index 305c5453e..052ebbd0e 100644 --- a/pkg/arvo/mar/publish/comment.hoon +++ b/pkg/arvo/mar/publish/comment.hoon @@ -25,7 +25,7 @@ ++ grab |% ++ mime - |= [mite:eyre p=octs:eyre] + |= [mite p=octs] |^ (rash q.p both-parser) ++ key-val |* [key=rule val=rule] diff --git a/pkg/arvo/mar/publish/info.hoon b/pkg/arvo/mar/publish/info.hoon index cb28e7e72..eb8d7cbcc 100644 --- a/pkg/arvo/mar/publish/info.hoon +++ b/pkg/arvo/mar/publish/info.hoon @@ -23,7 +23,7 @@ ++ grab |% ++ mime - |= [mite:eyre p=octs:eyre] + |= [mite p=octs] |^ (rash q.p both-parser) ++ key-val |* [key=rule val=rule] diff --git a/pkg/arvo/mar/txt.hoon b/pkg/arvo/mar/txt.hoon index 808a59aa1..20ca73547 100644 --- a/pkg/arvo/mar/txt.hoon +++ b/pkg/arvo/mar/txt.hoon @@ -11,7 +11,7 @@ :: ++ grab :: convert from |% - ++ mime |=({p/mite:eyre q/octs:eyre} (to-wain q.q)) + ++ mime |=((pair mite octs) (to-wain q.q)) ++ noun wain :: clam from %noun -- ++ grow diff --git a/pkg/arvo/mar/udon.hoon b/pkg/arvo/mar/udon.hoon index 8801ed27e..13afb4076 100644 --- a/pkg/arvo/mar/udon.hoon +++ b/pkg/arvo/mar/udon.hoon @@ -23,7 +23,7 @@ -- ++ grab |% - ++ mime |=({p/mite:eyre q/octs:eyre} q.q) + ++ mime |=((pair mite octs) q.q) ++ noun @t ++ txt of-wain:format -- diff --git a/pkg/arvo/mar/umd.hoon b/pkg/arvo/mar/umd.hoon index 3649701c1..195ad5489 100644 --- a/pkg/arvo/mar/umd.hoon +++ b/pkg/arvo/mar/umd.hoon @@ -23,7 +23,7 @@ -- ++ grab |% - ++ mime |=({p/mite:eyre q/octs:eyre} q.q) + ++ mime |=((pair mite octs) q.q) ++ noun @t ++ txt of-wain:format -- diff --git a/pkg/arvo/sys/zuse.hoon b/pkg/arvo/sys/zuse.hoon index 548c86fcb..39d87b5ff 100644 --- a/pkg/arvo/sys/zuse.hoon +++ b/pkg/arvo/sys/zuse.hoon @@ -75,10 +75,6 @@ ++ life @ud :: ship key revision ++ rift @ud :: ship continuity ++ mime {p/mite q/octs} :: mimetyped data -:: -:: -:: TODO: Rename to +mime once the current +mime and +mite are gone. The -:: ++ octs {p/@ud q/@} :: octet-stream ++ sock {p/ship q/ship} :: outgoing [our his] ::+| @@ -1559,9 +1555,7 @@ $put :: PUT $trac :: TRACE == :: - ++ mite (list @ta) :: mime type ++ moth {p/meth q/math r/(unit octs)} :: http operation - ++ octs {p/@ud q/@t} :: octet-stream ++ oryx @t :: CSRF secret ++ pork {p/(unit @ta) q/(list @t)} :: fully parsed url :: +prox: proxy notification From 550e6bffdeb973328a8a17d3443c8fec9bfa3d5b Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Sat, 3 Oct 2020 23:42:53 -0700 Subject: [PATCH 2/2] pill: solid --- bin/solid.pill | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/solid.pill b/bin/solid.pill index 3fec7cdd8..080db599b 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e4edc51f2f314a5236deb4a975d6364cca2164f104b6656446d52ba61ac3e45 -size 19166792 +oid sha256:6eaa8eba3b5170da4162feadcdc7804fa72db9b3746927d4a895fa192b0a6483 +size 6316916