Skip to content

Commit e7c611f

Browse files
functorafunctora
committed
upgrade proto
1 parent d81a97b commit e7c611f

File tree

15 files changed

+614
-1920
lines changed

15 files changed

+614
-1920
lines changed

‎pub/lnd-client/src/Proto/Autopilotrpc/Autopilot.hs‎

Lines changed: 21 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ module Proto.Autopilotrpc.Autopilot (
1313
) where
1414
import qualified Data.ProtoLens.Runtime.Control.DeepSeq as Control.DeepSeq
1515
import qualified Data.ProtoLens.Runtime.Data.ProtoLens.Prism as Data.ProtoLens.Prism
16-
import qualified Text.PrettyPrint.GenericPretty.Instance
1716
import qualified GHC.Generics
18-
import qualified Text.PrettyPrint.GenericPretty
1917
import qualified Data.ProtoLens.Runtime.Prelude as Prelude
2018
import qualified Data.ProtoLens.Runtime.Data.Int as Data.Int
2119
import qualified Data.ProtoLens.Runtime.Data.Monoid as Data.Monoid
@@ -52,7 +50,6 @@ instance Prelude.Show ModifyStatusRequest where
5250
'{'
5351
(Prelude.showString
5452
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
55-
instance Text.PrettyPrint.GenericPretty.Out ModifyStatusRequest
5653
instance Data.ProtoLens.Field.HasField ModifyStatusRequest "enable" Prelude.Bool where
5754
fieldOf _
5855
= (Prelude..)
@@ -158,7 +155,6 @@ instance Prelude.Show ModifyStatusResponse where
158155
'{'
159156
(Prelude.showString
160157
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
161-
instance Text.PrettyPrint.GenericPretty.Out ModifyStatusResponse
162158
instance Data.ProtoLens.Message ModifyStatusResponse where
163159
messageName _ = Data.Text.pack "autopilotrpc.ModifyStatusResponse"
164160
packedMessageDescriptor _
@@ -195,13 +191,13 @@ instance Data.ProtoLens.Message ModifyStatusResponse where
195191
Data.ProtoLens.unknownFields (\ !t -> Prelude.reverse t) x)
196192
else
197193
do tag <- Data.ProtoLens.Encoding.Bytes.getVarInt
198-
case tag of {
194+
case tag of
199195
wire
200196
-> do !y <- Data.ProtoLens.Encoding.Wire.parseTaggedValueFromWire
201197
wire
202198
loop
203199
(Lens.Family2.over
204-
Data.ProtoLens.unknownFields (\ !t -> (:) y t) x) }
200+
Data.ProtoLens.unknownFields (\ !t -> (:) y t) x)
205201
in
206202
(Data.ProtoLens.Encoding.Bytes.<?>)
207203
(do loop Data.ProtoLens.defMessage) "ModifyStatusResponse"
@@ -230,7 +226,6 @@ instance Prelude.Show QueryScoresRequest where
230226
'{'
231227
(Prelude.showString
232228
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
233-
instance Text.PrettyPrint.GenericPretty.Out QueryScoresRequest
234229
instance Data.ProtoLens.Field.HasField QueryScoresRequest "pubkeys" [Data.Text.Text] where
235230
fieldOf _
236231
= (Prelude..)
@@ -325,14 +320,9 @@ instance Data.ProtoLens.Message QueryScoresRequest where
325320
case tag of
326321
10
327322
-> do !y <- (Data.ProtoLens.Encoding.Bytes.<?>)
328-
(do value <- do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
329-
Data.ProtoLens.Encoding.Bytes.getBytes
330-
(Prelude.fromIntegral len)
331-
Data.ProtoLens.Encoding.Bytes.runEither
332-
(case Data.Text.Encoding.decodeUtf8' value of
333-
(Prelude.Left err)
334-
-> Prelude.Left (Prelude.show err)
335-
(Prelude.Right r) -> Prelude.Right r))
323+
(do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
324+
Data.ProtoLens.Encoding.Bytes.getText
325+
(Prelude.fromIntegral len))
336326
"pubkeys"
337327
v <- Data.ProtoLens.Encoding.Parser.Unsafe.unsafeLiftIO
338328
(Data.ProtoLens.Encoding.Growing.append mutable'pubkeys y)
@@ -413,7 +403,6 @@ instance Prelude.Show QueryScoresResponse where
413403
'{'
414404
(Prelude.showString
415405
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
416-
instance Text.PrettyPrint.GenericPretty.Out QueryScoresResponse
417406
instance Data.ProtoLens.Field.HasField QueryScoresResponse "results" [QueryScoresResponse'HeuristicResult] where
418407
fieldOf _
419408
= (Prelude..)
@@ -554,7 +543,6 @@ instance Prelude.Show QueryScoresResponse'HeuristicResult where
554543
'{'
555544
(Prelude.showString
556545
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
557-
instance Text.PrettyPrint.GenericPretty.Out QueryScoresResponse'HeuristicResult
558546
instance Data.ProtoLens.Field.HasField QueryScoresResponse'HeuristicResult "heuristic" Data.Text.Text where
559547
fieldOf _
560548
= (Prelude..)
@@ -643,14 +631,9 @@ instance Data.ProtoLens.Message QueryScoresResponse'HeuristicResult where
643631
case tag of
644632
10
645633
-> do y <- (Data.ProtoLens.Encoding.Bytes.<?>)
646-
(do value <- do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
647-
Data.ProtoLens.Encoding.Bytes.getBytes
648-
(Prelude.fromIntegral len)
649-
Data.ProtoLens.Encoding.Bytes.runEither
650-
(case Data.Text.Encoding.decodeUtf8' value of
651-
(Prelude.Left err)
652-
-> Prelude.Left (Prelude.show err)
653-
(Prelude.Right r) -> Prelude.Right r))
634+
(do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
635+
Data.ProtoLens.Encoding.Bytes.getText
636+
(Prelude.fromIntegral len))
654637
"heuristic"
655638
loop
656639
(Lens.Family2.set (Data.ProtoLens.Field.field @"heuristic") y x)
@@ -745,7 +728,6 @@ instance Prelude.Show QueryScoresResponse'HeuristicResult'ScoresEntry where
745728
'{'
746729
(Prelude.showString
747730
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
748-
instance Text.PrettyPrint.GenericPretty.Out QueryScoresResponse'HeuristicResult'ScoresEntry
749731
instance Data.ProtoLens.Field.HasField QueryScoresResponse'HeuristicResult'ScoresEntry "key" Data.Text.Text where
750732
fieldOf _
751733
= (Prelude..)
@@ -832,14 +814,9 @@ instance Data.ProtoLens.Message QueryScoresResponse'HeuristicResult'ScoresEntry
832814
case tag of
833815
10
834816
-> do y <- (Data.ProtoLens.Encoding.Bytes.<?>)
835-
(do value <- do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
836-
Data.ProtoLens.Encoding.Bytes.getBytes
837-
(Prelude.fromIntegral len)
838-
Data.ProtoLens.Encoding.Bytes.runEither
839-
(case Data.Text.Encoding.decodeUtf8' value of
840-
(Prelude.Left err)
841-
-> Prelude.Left (Prelude.show err)
842-
(Prelude.Right r) -> Prelude.Right r))
817+
(do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
818+
Data.ProtoLens.Encoding.Bytes.getText
819+
(Prelude.fromIntegral len))
843820
"key"
844821
loop (Lens.Family2.set (Data.ProtoLens.Field.field @"key") y x)
845822
17
@@ -914,7 +891,6 @@ instance Prelude.Show SetScoresRequest where
914891
'{'
915892
(Prelude.showString
916893
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
917-
instance Text.PrettyPrint.GenericPretty.Out SetScoresRequest
918894
instance Data.ProtoLens.Field.HasField SetScoresRequest "heuristic" Data.Text.Text where
919895
fieldOf _
920896
= (Prelude..)
@@ -999,14 +975,9 @@ instance Data.ProtoLens.Message SetScoresRequest where
999975
case tag of
1000976
10
1001977
-> do y <- (Data.ProtoLens.Encoding.Bytes.<?>)
1002-
(do value <- do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
1003-
Data.ProtoLens.Encoding.Bytes.getBytes
1004-
(Prelude.fromIntegral len)
1005-
Data.ProtoLens.Encoding.Bytes.runEither
1006-
(case Data.Text.Encoding.decodeUtf8' value of
1007-
(Prelude.Left err)
1008-
-> Prelude.Left (Prelude.show err)
1009-
(Prelude.Right r) -> Prelude.Right r))
978+
(do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
979+
Data.ProtoLens.Encoding.Bytes.getText
980+
(Prelude.fromIntegral len))
1010981
"heuristic"
1011982
loop
1012983
(Lens.Family2.set (Data.ProtoLens.Field.field @"heuristic") y x)
@@ -1100,7 +1071,6 @@ instance Prelude.Show SetScoresRequest'ScoresEntry where
11001071
'{'
11011072
(Prelude.showString
11021073
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
1103-
instance Text.PrettyPrint.GenericPretty.Out SetScoresRequest'ScoresEntry
11041074
instance Data.ProtoLens.Field.HasField SetScoresRequest'ScoresEntry "key" Data.Text.Text where
11051075
fieldOf _
11061076
= (Prelude..)
@@ -1181,14 +1151,9 @@ instance Data.ProtoLens.Message SetScoresRequest'ScoresEntry where
11811151
case tag of
11821152
10
11831153
-> do y <- (Data.ProtoLens.Encoding.Bytes.<?>)
1184-
(do value <- do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
1185-
Data.ProtoLens.Encoding.Bytes.getBytes
1186-
(Prelude.fromIntegral len)
1187-
Data.ProtoLens.Encoding.Bytes.runEither
1188-
(case Data.Text.Encoding.decodeUtf8' value of
1189-
(Prelude.Left err)
1190-
-> Prelude.Left (Prelude.show err)
1191-
(Prelude.Right r) -> Prelude.Right r))
1154+
(do len <- Data.ProtoLens.Encoding.Bytes.getVarInt
1155+
Data.ProtoLens.Encoding.Bytes.getText
1156+
(Prelude.fromIntegral len))
11921157
"key"
11931158
loop (Lens.Family2.set (Data.ProtoLens.Field.field @"key") y x)
11941159
17
@@ -1258,7 +1223,6 @@ instance Prelude.Show SetScoresResponse where
12581223
'{'
12591224
(Prelude.showString
12601225
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
1261-
instance Text.PrettyPrint.GenericPretty.Out SetScoresResponse
12621226
instance Data.ProtoLens.Message SetScoresResponse where
12631227
messageName _ = Data.Text.pack "autopilotrpc.SetScoresResponse"
12641228
packedMessageDescriptor _
@@ -1295,13 +1259,13 @@ instance Data.ProtoLens.Message SetScoresResponse where
12951259
Data.ProtoLens.unknownFields (\ !t -> Prelude.reverse t) x)
12961260
else
12971261
do tag <- Data.ProtoLens.Encoding.Bytes.getVarInt
1298-
case tag of {
1262+
case tag of
12991263
wire
13001264
-> do !y <- Data.ProtoLens.Encoding.Wire.parseTaggedValueFromWire
13011265
wire
13021266
loop
13031267
(Lens.Family2.over
1304-
Data.ProtoLens.unknownFields (\ !t -> (:) y t) x) }
1268+
Data.ProtoLens.unknownFields (\ !t -> (:) y t) x)
13051269
in
13061270
(Data.ProtoLens.Encoding.Bytes.<?>)
13071271
(do loop Data.ProtoLens.defMessage) "SetScoresResponse"
@@ -1325,7 +1289,6 @@ instance Prelude.Show StatusRequest where
13251289
'{'
13261290
(Prelude.showString
13271291
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
1328-
instance Text.PrettyPrint.GenericPretty.Out StatusRequest
13291292
instance Data.ProtoLens.Message StatusRequest where
13301293
messageName _ = Data.Text.pack "autopilotrpc.StatusRequest"
13311294
packedMessageDescriptor _
@@ -1360,13 +1323,13 @@ instance Data.ProtoLens.Message StatusRequest where
13601323
Data.ProtoLens.unknownFields (\ !t -> Prelude.reverse t) x)
13611324
else
13621325
do tag <- Data.ProtoLens.Encoding.Bytes.getVarInt
1363-
case tag of {
1326+
case tag of
13641327
wire
13651328
-> do !y <- Data.ProtoLens.Encoding.Wire.parseTaggedValueFromWire
13661329
wire
13671330
loop
13681331
(Lens.Family2.over
1369-
Data.ProtoLens.unknownFields (\ !t -> (:) y t) x) }
1332+
Data.ProtoLens.unknownFields (\ !t -> (:) y t) x)
13701333
in
13711334
(Data.ProtoLens.Encoding.Bytes.<?>)
13721335
(do loop Data.ProtoLens.defMessage) "StatusRequest"
@@ -1391,7 +1354,6 @@ instance Prelude.Show StatusResponse where
13911354
'{'
13921355
(Prelude.showString
13931356
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
1394-
instance Text.PrettyPrint.GenericPretty.Out StatusResponse
13951357
instance Data.ProtoLens.Field.HasField StatusResponse "active" Prelude.Bool where
13961358
fieldOf _
13971359
= (Prelude..)

‎pub/lnd-client/src/Proto/Chainrpc/Chainnotifier.hs‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ module Proto.Chainrpc.Chainnotifier (
1212
) where
1313
import qualified Data.ProtoLens.Runtime.Control.DeepSeq as Control.DeepSeq
1414
import qualified Data.ProtoLens.Runtime.Data.ProtoLens.Prism as Data.ProtoLens.Prism
15-
import qualified Text.PrettyPrint.GenericPretty.Instance
1615
import qualified GHC.Generics
17-
import qualified Text.PrettyPrint.GenericPretty
1816
import qualified Data.ProtoLens.Runtime.Prelude as Prelude
1917
import qualified Data.ProtoLens.Runtime.Data.Int as Data.Int
2018
import qualified Data.ProtoLens.Runtime.Data.Monoid as Data.Monoid
@@ -53,7 +51,6 @@ instance Prelude.Show BlockEpoch where
5351
'{'
5452
(Prelude.showString
5553
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
56-
instance Text.PrettyPrint.GenericPretty.Out BlockEpoch
5754
instance Data.ProtoLens.Field.HasField BlockEpoch "hash" Data.ByteString.ByteString where
5855
fieldOf _
5956
= (Prelude..)
@@ -207,7 +204,6 @@ instance Prelude.Show ConfDetails where
207204
'{'
208205
(Prelude.showString
209206
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
210-
instance Text.PrettyPrint.GenericPretty.Out ConfDetails
211207
instance Data.ProtoLens.Field.HasField ConfDetails "rawTx" Data.ByteString.ByteString where
212208
fieldOf _
213209
= (Prelude..)
@@ -446,14 +442,12 @@ instance Prelude.Show ConfEvent where
446442
'{'
447443
(Prelude.showString
448444
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
449-
instance Text.PrettyPrint.GenericPretty.Out ConfEvent
450445
data ConfEvent'Event
451446
= ConfEvent'Conf !ConfDetails | ConfEvent'Reorg !Reorg
452447
deriving stock (Prelude.Show,
453448
Prelude.Eq,
454449
Prelude.Ord,
455450
GHC.Generics.Generic)
456-
instance Text.PrettyPrint.GenericPretty.Out ConfEvent'Event
457451
instance Data.ProtoLens.Field.HasField ConfEvent "maybe'event" (Prelude.Maybe ConfEvent'Event) where
458452
fieldOf _
459453
= (Prelude..)
@@ -666,7 +660,6 @@ instance Prelude.Show ConfRequest where
666660
'{'
667661
(Prelude.showString
668662
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
669-
instance Text.PrettyPrint.GenericPretty.Out ConfRequest
670663
instance Data.ProtoLens.Field.HasField ConfRequest "txid" Data.ByteString.ByteString where
671664
fieldOf _
672665
= (Prelude..)
@@ -901,7 +894,6 @@ instance Prelude.Show Outpoint where
901894
'{'
902895
(Prelude.showString
903896
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
904-
instance Text.PrettyPrint.GenericPretty.Out Outpoint
905897
instance Data.ProtoLens.Field.HasField Outpoint "hash" Data.ByteString.ByteString where
906898
fieldOf _
907899
= (Prelude..)
@@ -1045,7 +1037,6 @@ instance Prelude.Show Reorg where
10451037
'{'
10461038
(Prelude.showString
10471039
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
1048-
instance Text.PrettyPrint.GenericPretty.Out Reorg
10491040
instance Data.ProtoLens.Message Reorg where
10501041
messageName _ = Data.Text.pack "chainrpc.Reorg"
10511042
packedMessageDescriptor _
@@ -1078,13 +1069,13 @@ instance Data.ProtoLens.Message Reorg where
10781069
Data.ProtoLens.unknownFields (\ !t -> Prelude.reverse t) x)
10791070
else
10801071
do tag <- Data.ProtoLens.Encoding.Bytes.getVarInt
1081-
case tag of {
1072+
case tag of
10821073
wire
10831074
-> do !y <- Data.ProtoLens.Encoding.Wire.parseTaggedValueFromWire
10841075
wire
10851076
loop
10861077
(Lens.Family2.over
1087-
Data.ProtoLens.unknownFields (\ !t -> (:) y t) x) }
1078+
Data.ProtoLens.unknownFields (\ !t -> (:) y t) x)
10881079
in
10891080
(Data.ProtoLens.Encoding.Bytes.<?>)
10901081
(do loop Data.ProtoLens.defMessage) "Reorg"
@@ -1117,7 +1108,6 @@ instance Prelude.Show SpendDetails where
11171108
'{'
11181109
(Prelude.showString
11191110
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
1120-
instance Text.PrettyPrint.GenericPretty.Out SpendDetails
11211111
instance Data.ProtoLens.Field.HasField SpendDetails "spendingOutpoint" Outpoint where
11221112
fieldOf _
11231113
= (Prelude..)
@@ -1424,14 +1414,12 @@ instance Prelude.Show SpendEvent where
14241414
'{'
14251415
(Prelude.showString
14261416
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
1427-
instance Text.PrettyPrint.GenericPretty.Out SpendEvent
14281417
data SpendEvent'Event
14291418
= SpendEvent'Spend !SpendDetails | SpendEvent'Reorg !Reorg
14301419
deriving stock (Prelude.Show,
14311420
Prelude.Eq,
14321421
Prelude.Ord,
14331422
GHC.Generics.Generic)
1434-
instance Text.PrettyPrint.GenericPretty.Out SpendEvent'Event
14351423
instance Data.ProtoLens.Field.HasField SpendEvent "maybe'event" (Prelude.Maybe SpendEvent'Event) where
14361424
fieldOf _
14371425
= (Prelude..)
@@ -1645,7 +1633,6 @@ instance Prelude.Show SpendRequest where
16451633
'{'
16461634
(Prelude.showString
16471635
(Data.ProtoLens.showMessageShort __x) (Prelude.showChar '}' __s))
1648-
instance Text.PrettyPrint.GenericPretty.Out SpendRequest
16491636
instance Data.ProtoLens.Field.HasField SpendRequest "outpoint" Outpoint where
16501637
fieldOf _
16511638
= (Prelude..)

0 commit comments

Comments
 (0)