ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 18:12:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2820 from urbit/king-crud-type

Browse Source 
king: don't parse crud events, just treat them as nouns.
This commit is contained in:
ixv 2020-04-30 13:07:54 -07:00 committed by GitHub
commit 51876044f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/hs/urbit-king/lib/Urbit/Arvo/Event.hs
View File

@ -24,6 +24,7 @@ type Life = Word -- Number of Azimoth key revs.
type Bloq = Atom -- TODO type Bloq = Atom -- TODO
type Oath = Atom -- Signature type Oath = Atom -- Signature
-- Parsed URLs ----------------------------------------------------------------- -- Parsed URLs -----------------------------------------------------------------
type Host = Each Turf Ipv4 type Host = Each Turf Ipv4
@ -169,7 +170,7 @@ data HttpServerReq = HttpServerReq
data HttpClientEv data HttpClientEv
= HttpClientEvReceive (KingId, ()) ServerId HttpEvent = HttpClientEvReceive (KingId, ()) ServerId HttpEvent
| HttpClientEvBorn (KingId, ()) () | HttpClientEvBorn (KingId, ()) ()
| HttpClientEvCrud Path Cord Tang | HttpClientEvCrud Path Noun
deriving (Eq, Ord, Show) deriving (Eq, Ord, Show)
data HttpServerEv data HttpServerEv
@ -178,7 +179,7 @@ data HttpServerEv
| HttpServerEvRequestLocal (ServId, UD, UD, ()) HttpServerReq | HttpServerEvRequestLocal (ServId, UD, UD, ()) HttpServerReq
| HttpServerEvLive (ServId, ()) Port (Maybe Port) | HttpServerEvLive (ServId, ()) Port (Maybe Port)
| HttpServerEvBorn (KingId, ()) () | HttpServerEvBorn (KingId, ()) ()
| HttpServerEvCrud Path Cord Tang | HttpServerEvCrud Path Noun
deriving (Eq, Ord, Show) deriving (Eq, Ord, Show)
deriveNoun ''Address deriveNoun ''Address
@ -193,7 +194,7 @@ deriveNoun ''HttpServerReq
data AmesEv data AmesEv
= AmesEvHear () AmesDest Bytes = AmesEvHear () AmesDest Bytes
| AmesEvHole () AmesDest Bytes | AmesEvHole () AmesDest Bytes
| AmesEvCrud Path Cord Tang | AmesEvCrud Path Noun
deriving (Eq, Ord, Show) deriving (Eq, Ord, Show)
deriveNoun ''AmesEv deriveNoun ''AmesEv
@ -205,7 +206,7 @@ data ArvoEv
= ArvoEvWhom () Ship = ArvoEvWhom () Ship
| ArvoEvWack () Word512 | ArvoEvWack () Word512
| ArvoEvWarn Path Noun | ArvoEvWarn Path Noun
| ArvoEvCrud Path Cord Tang | ArvoEvCrud Path Noun
| ArvoEvVeer Atom Noun | ArvoEvVeer Atom Noun
deriving (Eq, Ord, Show) deriving (Eq, Ord, Show)
@ -216,7 +217,7 @@ deriveNoun ''ArvoEv
data BoatEv data BoatEv
= BoatEvBoat () () = BoatEvBoat () ()
| BoatEvCrud Path Cord Tang | BoatEvCrud Path Noun
deriving (Eq, Ord, Show) deriving (Eq, Ord, Show)
deriveNoun ''BoatEv deriveNoun ''BoatEv
@ -227,7 +228,7 @@ deriveNoun ''BoatEv
data BehnEv data BehnEv
= BehnEvWake () () = BehnEvWake () ()
| BehnEvBorn (KingId, ()) () | BehnEvBorn (KingId, ()) ()
| BehnEvCrud Path Cord Tang | BehnEvCrud Path Noun
deriving (Eq, Ord, Show) deriving (Eq, Ord, Show)
deriveNoun ''BehnEv deriveNoun ''BehnEv
@ -237,7 +238,7 @@ deriveNoun ''BehnEv
data NewtEv data NewtEv
= NewtEvBorn (KingId, ()) () = NewtEvBorn (KingId, ()) ()
| NewtEvCrud Path Cord Tang | NewtEvCrud Path Noun
deriving (Eq, Ord, Show) deriving (Eq, Ord, Show)
deriveNoun ''NewtEv deriveNoun ''NewtEv
@ -247,7 +248,7 @@ deriveNoun ''NewtEv
data SyncEv data SyncEv
= SyncEvInto (Nullable (KingId, ())) Desk Bool [(Path, Maybe Mime)] = SyncEvInto (Nullable (KingId, ())) Desk Bool [(Path, Maybe Mime)]
| SyncEvCrud Path Cord Tang | SyncEvCrud Path Noun
deriving (Eq, Ord, Show) deriving (Eq, Ord, Show)
deriveNoun ''SyncEv deriveNoun ''SyncEv
@ -278,7 +279,7 @@ data TermEv
| TermEvBlew (UD, ()) Word Word | TermEvBlew (UD, ()) Word Word
| TermEvBoot (UD, ()) Bool LegacyBootEvent | TermEvBoot (UD, ()) Bool LegacyBootEvent
| TermEvHail (UD, ()) () | TermEvHail (UD, ()) ()
| TermEvCrud Path Cord Tang | TermEvCrud Path Noun
deriving (Eq, Show) deriving (Eq, Show)
deriveNoun ''LegacyBootEvent deriveNoun ''LegacyBootEvent