All tests pass.

2020-04-14 08:18:36 -05:00 · 2020-04-14 08:18:36 -05:00 · 9adc19aa9c
parent 975d7cde57
commit 9adc19aa9c
4 changed files with 131 additions and 125 deletions
--- a/spec/fixtures/normal.bundle
+++ b/spec/fixtures/normal.bundle
@ -1,89 +1,99 @@
-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind 1db28f82-904c-4a31-a28a-b2da5f7be398
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind b049f082-861f-43f0-bc10-ca97b2b91b2e
 prev NONE
 depth 0
+lipmaa 0

-foo:"bar"
+foo:"123"

-signature FZ8FJRCXX1PPN43VCD45PFWANJGYPZVA9JQ4NHBQGBFBYJG6CA31NFEXK67Z90R2DBS3NGT8M0CBYG4CMDKCBSRFW838J56T4F3K40G.sig.ed25519
+signature X4KF6YM3YMR457VTJ7HGY92F6W65YQBEG3WS5QDFNSAF45KHMDZZZRWK710F04Y6TPM2AJ3W135RSF42V8DAE7MJSSTCHYP7JQG7E10.sig.ed25519

-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind 375de134-161d-47c8-8ff6-e80776155d39
-prev %4541G6XQ9VBG8N0VXCF4K04F0AX1JQNJD3NCPV0JYHQJV0KVJW5G.sha256
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind bbbae2a3-024b-472d-96b3-8dcc80fcef9e
+prev %4YDSWA2SWPH28AA1AH40VJBJ1RT8KKXWJFVSZ3FTYW3S2JG7R2EG.sha256
 depth 1
+lipmaa 0

-foo:"810c05f8-d594-493a-a540-21d5c1cb52c6"
+foo:"123"

-signature 5DVXT2X4T5XRQ99FB6PAJ19F3QA2V37QWCZADYQDGGH9NYG1JCTTCH5ETGJCPQZXT3A93GASGYAZ93PN836G15R7MM8KM1KK1HX501G.sig.ed25519
+signature 4NACJ81VJTC57W8DBR2JAAEYNGPZ1D08CFXTS66ZF89W5GJHHHH0PMYAQBPWWSMZQWN68XASHAG76605Q0DVWKDW53VYNSQVD05RE38.sig.ed25519

-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind 483290a3-e79d-4d03-97d0-85439bd716f3
-prev %4D9R2SR4PCQEZ542CPXPS2ZHPRSSVXEVENFF91TP82FA45Y1RE5G.sha256
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind 031a91fd-4c47-41a2-b56a-e6e99bfb4e86
+prev %510TYAE8EJPWG9JQXGGVBBB8PG2N3BG728R6KZ97Y8YG7K8RGEQG.sha256
 depth 2
+lipmaa 1

-foo:"a88b270e-fa4b-40b7-ba35-fa498f9adfc6"
+foo:"bar"

-signature 27B87NF1R6ZCKWTD49XXC5DAVJD1TN7K0JJA2RFTNG1QSSEBS9YX71YPZ5A2J7WP8B0QZH259B6108CJSX4GY8X8N8B1Y2V2SSWGR08.sig.ed25519
+signature C2PE2DSJVM8NEKSYAN3BZZ4EPM3BYCAX0NHAD2NWS31C2TBAGSJPV1GZXRWKQCP9VV3NAJK0N6F7ZMDC1YPKTEJXKQD57EN61ZVYY08.sig.ed25519

-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind 4f3b925e-a8fd-4780-a357-1d67eca03459
-prev %1N8Q1NZKW29CPFTTGNNVD8DZE99Q0KNF5JYN3VW9545S5DB69KKG.sha256
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind f4716a10-bb95-4919-8866-fd19188f3457
+prev %YNKM86MYJC3VN8X6YQV0F7XXX9RTZEEFX5T3KJZ97093GJTWDPQG.sha256
 depth 3
+lipmaa 2

-foo:"bar"
+foo:"2ab907c7-9a5d-42f1-9ca9-5ac0853daad0"

-signature 15Z9J3MAB1TX7BJPPKRA8NK097J89G1B6QNAD7J5GV6P1WC3EX3SXJFWE4D0GFQJFA0HR74RNEYSFSAHNHBKBMK0Z7C6NY7HWASQG38.sig.ed25519
+signature VXEZG4PWY6DBNMY0A5B8R3FFATN6XFG812V1ZRSZ5VSJ99EKFS7NQN689SP7P4KT8KFM7NQEV3DRDB3XNZ10SZN25ZRPCD14ECFXM1R.sig.ed25519

-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind 8aeebbd8-3317-4de0-a770-1abe390af126
-prev %JTEFPAT798AGDPKPHRMAV36GZAFNEBEMR5ZA9YHNJX0W9HFSP8EG.sha256
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind 617b7d9a-dd39-44a7-afaf-0d5b3651091c
+prev %X67GBXJ0216VM2AF580T0B6EAMJTQPSYXPYDAKNQTDC7QSG32ZR0.sha256
 depth 4
+lipmaa 1

 foo:"123"

-signature XMGXES56E3EWFXXYPCD81SPNQPZ0NDXDQ0X366R3AHEF75GJVR74RW6F6HNDRWBJ2Z1SSC45N0MTK92MDHS1BXSMC3QJTQBEPN8TW0R.sig.ed25519
+signature RX5CPHS5J9BABRKYXCHK59WF9S87SFCVWD2644KYB5BEXX0TAQWT9ZS2MKDW62KRZRX34PRE7NNHB9KHGPFHWDBCB9E2MWNVD5HBG1R.sig.ed25519

-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind 80c5cd4d-f9b6-447f-9d0e-1065ee563d7f
-prev %8X06YEJEP256CQ0M2A04ARW68ABAD4EKSJE76XDF5CDAMJ5Q5NWG.sha256
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind 066a62ea-eae0-47ae-8013-401665109dbf
+prev %F5T6F8K3PFDA2E4QDYP3M5CWF98Y1B46FSVY64BP6YVSNT0AZPV0.sha256
 depth 5
+lipmaa 4

-foo:"bar"
+foo:"123"

-signature HCP8ECPYW1J9QW7HZKNYEJSG5B59NKBZX4YDYQCW9PWTRECQGT8CR2VJ63WBGE5PMQFWHQJQGS9FQREMVSTNTVQEQRMP242HJFHCP10.sig.ed25519
+signature JCPE2X5MPTVR6KKPYYBY9E8MNEG85P2FNMZA342W6HMNAWJ8AQXJF5QX0H6XP3ATR9TBJN4HG7XKFT5W2DZXRW6KZNSG4NV18QT180R.sig.ed25519

-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind dc2da357-99bb-44ab-811b-1e305b73b8f9
-prev %669MW82Y549827TWM70AZV7K2JS9RP96W8AMGYARFH7YDENJ0M9G.sha256
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind ba16b9f6-a0bc-44e4-b873-da52308186e8
+prev %KDKK65CX8GMV7EFCJ4K3J77T38SNDE6DX1TE7AKKGW7X74Z63WKG.sha256
 depth 6
-
-foo:"123"
-
-signature KXFCZVMWQHDP9D950AMFXN6MXNYZ3KTMZ30Y29N3BEE6Y9ZSM7BE2SJKKCDMVFSST17EJKFZJ173ZDCC9ZTCM6GJASE2JB3RAW8ZY0R.sig.ed25519
-
-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind e6416139-2e25-4b0a-95c2-d8fc2bece4cf
-prev %HBXCMMYD7Y2NGSB7X05X1HQ21YYJZEN7D5RKV6KW83KN6R0RCXK0.sha256
-depth 7
-
-foo:"123"
-
-signature BMGDDWQ4S9XVZZHMWFHJCVTAQXDHEYC2MX05DK7N0KDW2EP36AVDS76YS2ZNNR1K3VHN6EEJHW5SEF72QXB8QJT330RQNXTXFDPX81G.sig.ed25519
-
-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind 1fbf93de-e1fb-41ce-9f23-b275b5aa8578
-prev %DHTGB2NFWHQWDV3PPZVP2DV8CGXAAVA12KV0E7VQZE6T6STHGJC0.sha256
-depth 8
+lipmaa 5

 foo:"bar"

-signature E4TZJVQ3ZHY9KBB681FDZX8F516NQ5S02R2SCMKNGY15AFY972X75C27VVZ5BV31ZRTKK6YWW1R76W43FSSCBEPRFWJ5TG39TJMGP08.sig.ed25519
+signature JSSFBAZ58Y73NPWZ912KYS0EZ1WA3V3FAG9VW2TF99B3Z0RH06Q52DS2AEBRPEZJFZWBA1Q4WYR7N19VVGRZ9KDFYAX64PCTA9BEW3G.sig.ed25519

-author @VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519
-kind aca35bce-12b4-4c67-8e06-f62e5b97c7aa
-prev %3AG0M4483SPP3GCERE25RWZF50Y8CYCJANC2SRNHT4X1N1S37110.sha256
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind 541368e0-3bbc-4408-a743-c649d88e2547
+prev %9TVN1WPETZFEDJ49V2B2KFQ7VC58ERWYSJ0SWCFM1A7KBCTYP0X0.sha256
+depth 7
+lipmaa 6
+
+foo:"fb97ba07-d037-4550-a5ca-ec63ad91109c"
+
+signature BFVWMHGZ2Z8GDWGRVJP989DGCR3B4TFNSW6T5VVNS5P0EMFCTXYB583A5V4AVD4DGTWHSGA67N52VP2AS3MEBYM7BQXH4YYAMAK2W1R.sig.ed25519
+
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind c8f2c09f-91f2-48db-b02d-8d9503a7fcd8
+prev %XFS3B295588XMP91TM50TPGK78WP8KXESSWAG2BHTSZAFCRDDXFG.sha256
+depth 8
+lipmaa 4
+
+foo:"a511ac1e-089f-4876-8493-d0d827760515"
+
+signature YRCG26YGM4TB89K96H6HXZNH0ZXHQB2R8P5FSZ8EHG4GDK1X80BV3GN6S7PW4XNWZPFVDQES4TC5AVRB7D17MF21H86QB58DAKHX210.sig.ed25519
+
+author @78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519
+kind 51c783e4-8729-4e73-9d31-e16db8605004
+prev %4PE7S4XCCAYPQ42S98K730CEW6ME5HRWJKHHEGYVYPFHSJWXEY1G.sha256
 depth 9
+lipmaa 8

-foo:"123"
+foo:"bar"

-signature 3NWJ65FGX914DDHWSF17BMAWKMDDMP4D0661WZK0Y928RB927N8NM2CGK9Y5P8RYGQ2FRGETSQYY5HQX2SKBT81ETRKVB3X56YBGC1G.sig.ed25519
+signature BBE732XXZ33XTCW1CRA9RG13FQ0FVMR61SAHD621VH8C64B4WA8C86JSTTAHG4CSGNBJJ7YSAVRF3YEBX6GTEB6RRWGDA84VJZPMR3R.sig.ed25519
--- a/spec/pigeon/lexer_spec.rb
+++ b/spec/pigeon/lexer_spec.rb
@ -2,105 +2,105 @@ require "spec_helper"

 RSpec.describe Pigeon::Lexer do
  EXPECTED_TOKENS1 = [
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "1db28f82-904c-4a31-a28a-b2da5f7be398"],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "b049f082-861f-43f0-bc10-ca97b2b91b2e"],
    [:PREV, "NONE"],
    [:DEPTH, 0],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(0)],
+    [:LIPMAA, 0],
    [:HEADER_END],
-    [:BODY_ENTRY, "foo", "\"bar\""],
+    [:BODY_ENTRY, "foo", "\"123\""],
    [:BODY_END],
-    [:SIGNATURE, "FZ8FJRCXX1PPN43VCD45PFWANJGYPZVA9JQ4NHBQGBFBYJG6CA31NFEXK67Z90R2DBS3NGT8M0CBYG4CMDKCBSRFW838J56T4F3K40G.sig.ed25519"],
+    [:SIGNATURE, "X4KF6YM3YMR457VTJ7HGY92F6W65YQBEG3WS5QDFNSAF45KHMDZZZRWK710F04Y6TPM2AJ3W135RSF42V8DAE7MJSSTCHYP7JQG7E10.sig.ed25519"],
    [:MESSAGE_END],
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "375de134-161d-47c8-8ff6-e80776155d39"],
-    [:PREV, "%4541G6XQ9VBG8N0VXCF4K04F0AX1JQNJD3NCPV0JYHQJV0KVJW5G.sha256"],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "bbbae2a3-024b-472d-96b3-8dcc80fcef9e"],
+    [:PREV, "%4YDSWA2SWPH28AA1AH40VJBJ1RT8KKXWJFVSZ3FTYW3S2JG7R2EG.sha256"],
    [:DEPTH, 1],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(1)],
+    [:LIPMAA, 0],
    [:HEADER_END],
-    [:BODY_ENTRY, "foo", "\"810c05f8-d594-493a-a540-21d5c1cb52c6\""],
+    [:BODY_ENTRY, "foo", "\"123\""],
    [:BODY_END],
-    [:SIGNATURE, "5DVXT2X4T5XRQ99FB6PAJ19F3QA2V37QWCZADYQDGGH9NYG1JCTTCH5ETGJCPQZXT3A93GASGYAZ93PN836G15R7MM8KM1KK1HX501G.sig.ed25519"],
+    [:SIGNATURE, "4NACJ81VJTC57W8DBR2JAAEYNGPZ1D08CFXTS66ZF89W5GJHHHH0PMYAQBPWWSMZQWN68XASHAG76605Q0DVWKDW53VYNSQVD05RE38.sig.ed25519"],
    [:MESSAGE_END],
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "483290a3-e79d-4d03-97d0-85439bd716f3"],
-    [:PREV, "%4D9R2SR4PCQEZ542CPXPS2ZHPRSSVXEVENFF91TP82FA45Y1RE5G.sha256"],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "031a91fd-4c47-41a2-b56a-e6e99bfb4e86"],
+    [:PREV, "%510TYAE8EJPWG9JQXGGVBBB8PG2N3BG728R6KZ97Y8YG7K8RGEQG.sha256"],
    [:DEPTH, 2],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(2)],
+    [:LIPMAA, 1],
    [:HEADER_END],
-    [:BODY_ENTRY, "foo", "\"a88b270e-fa4b-40b7-ba35-fa498f9adfc6\""],
+    [:BODY_ENTRY, "foo", "\"bar\""],
    [:BODY_END],
-    [:SIGNATURE, "27B87NF1R6ZCKWTD49XXC5DAVJD1TN7K0JJA2RFTNG1QSSEBS9YX71YPZ5A2J7WP8B0QZH259B6108CJSX4GY8X8N8B1Y2V2SSWGR08.sig.ed25519"],
+    [:SIGNATURE, "C2PE2DSJVM8NEKSYAN3BZZ4EPM3BYCAX0NHAD2NWS31C2TBAGSJPV1GZXRWKQCP9VV3NAJK0N6F7ZMDC1YPKTEJXKQD57EN61ZVYY08.sig.ed25519"],
    [:MESSAGE_END],
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "4f3b925e-a8fd-4780-a357-1d67eca03459"],
-    [:PREV, "%1N8Q1NZKW29CPFTTGNNVD8DZE99Q0KNF5JYN3VW9545S5DB69KKG.sha256"],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "f4716a10-bb95-4919-8866-fd19188f3457"],
+    [:PREV, "%YNKM86MYJC3VN8X6YQV0F7XXX9RTZEEFX5T3KJZ97093GJTWDPQG.sha256"],
    [:DEPTH, 3],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(3)],
+    [:LIPMAA, 2],
    [:HEADER_END],
-    [:BODY_ENTRY, "foo", "\"bar\""],
+    [:BODY_ENTRY, "foo", "\"2ab907c7-9a5d-42f1-9ca9-5ac0853daad0\""],
    [:BODY_END],
-    [:SIGNATURE, "15Z9J3MAB1TX7BJPPKRA8NK097J89G1B6QNAD7J5GV6P1WC3EX3SXJFWE4D0GFQJFA0HR74RNEYSFSAHNHBKBMK0Z7C6NY7HWASQG38.sig.ed25519"],
+    [:SIGNATURE, "VXEZG4PWY6DBNMY0A5B8R3FFATN6XFG812V1ZRSZ5VSJ99EKFS7NQN689SP7P4KT8KFM7NQEV3DRDB3XNZ10SZN25ZRPCD14ECFXM1R.sig.ed25519"],
    [:MESSAGE_END],
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "8aeebbd8-3317-4de0-a770-1abe390af126"],
-    [:PREV, "%JTEFPAT798AGDPKPHRMAV36GZAFNEBEMR5ZA9YHNJX0W9HFSP8EG.sha256"],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "617b7d9a-dd39-44a7-afaf-0d5b3651091c"],
+    [:PREV, "%X67GBXJ0216VM2AF580T0B6EAMJTQPSYXPYDAKNQTDC7QSG32ZR0.sha256"],
    [:DEPTH, 4],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(4)],
+    [:LIPMAA, 1],
    [:HEADER_END],
    [:BODY_ENTRY, "foo", "\"123\""],
    [:BODY_END],
-    [:SIGNATURE, "XMGXES56E3EWFXXYPCD81SPNQPZ0NDXDQ0X366R3AHEF75GJVR74RW6F6HNDRWBJ2Z1SSC45N0MTK92MDHS1BXSMC3QJTQBEPN8TW0R.sig.ed25519"],
+    [:SIGNATURE, "RX5CPHS5J9BABRKYXCHK59WF9S87SFCVWD2644KYB5BEXX0TAQWT9ZS2MKDW62KRZRX34PRE7NNHB9KHGPFHWDBCB9E2MWNVD5HBG1R.sig.ed25519"],
    [:MESSAGE_END],
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "80c5cd4d-f9b6-447f-9d0e-1065ee563d7f"],
-    [:PREV, "%8X06YEJEP256CQ0M2A04ARW68ABAD4EKSJE76XDF5CDAMJ5Q5NWG.sha256"],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "066a62ea-eae0-47ae-8013-401665109dbf"],
+    [:PREV, "%F5T6F8K3PFDA2E4QDYP3M5CWF98Y1B46FSVY64BP6YVSNT0AZPV0.sha256"],
    [:DEPTH, 5],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(5)],
+    [:LIPMAA, 4],
    [:HEADER_END],
-    [:BODY_ENTRY, "foo", "\"bar\""],
+    [:BODY_ENTRY, "foo", "\"123\""],
    [:BODY_END],
-    [:SIGNATURE, "HCP8ECPYW1J9QW7HZKNYEJSG5B59NKBZX4YDYQCW9PWTRECQGT8CR2VJ63WBGE5PMQFWHQJQGS9FQREMVSTNTVQEQRMP242HJFHCP10.sig.ed25519"],
+    [:SIGNATURE, "JCPE2X5MPTVR6KKPYYBY9E8MNEG85P2FNMZA342W6HMNAWJ8AQXJF5QX0H6XP3ATR9TBJN4HG7XKFT5W2DZXRW6KZNSG4NV18QT180R.sig.ed25519"],
    [:MESSAGE_END],
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "dc2da357-99bb-44ab-811b-1e305b73b8f9"],
-    [:PREV, "%669MW82Y549827TWM70AZV7K2JS9RP96W8AMGYARFH7YDENJ0M9G.sha256"],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "ba16b9f6-a0bc-44e4-b873-da52308186e8"],
+    [:PREV, "%KDKK65CX8GMV7EFCJ4K3J77T38SNDE6DX1TE7AKKGW7X74Z63WKG.sha256"],
    [:DEPTH, 6],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(6)],
-    [:HEADER_END],
-    [:BODY_ENTRY, "foo", "\"123\""],
-    [:BODY_END],
-    [:SIGNATURE, "KXFCZVMWQHDP9D950AMFXN6MXNYZ3KTMZ30Y29N3BEE6Y9ZSM7BE2SJKKCDMVFSST17EJKFZJ173ZDCC9ZTCM6GJASE2JB3RAW8ZY0R.sig.ed25519"],
-    [:MESSAGE_END],
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "e6416139-2e25-4b0a-95c2-d8fc2bece4cf"],
-    [:PREV, "%HBXCMMYD7Y2NGSB7X05X1HQ21YYJZEN7D5RKV6KW83KN6R0RCXK0.sha256"],
-    [:DEPTH, 7],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(7)],
-    [:HEADER_END],
-    [:BODY_ENTRY, "foo", "\"123\""],
-    [:BODY_END],
-    [:SIGNATURE, "BMGDDWQ4S9XVZZHMWFHJCVTAQXDHEYC2MX05DK7N0KDW2EP36AVDS76YS2ZNNR1K3VHN6EEJHW5SEF72QXB8QJT330RQNXTXFDPX81G.sig.ed25519"],
-    [:MESSAGE_END],
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "1fbf93de-e1fb-41ce-9f23-b275b5aa8578"],
-    [:PREV, "%DHTGB2NFWHQWDV3PPZVP2DV8CGXAAVA12KV0E7VQZE6T6STHGJC0.sha256"],
-    [:DEPTH, 8],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(8)],
+    [:LIPMAA, 5],
    [:HEADER_END],
    [:BODY_ENTRY, "foo", "\"bar\""],
    [:BODY_END],
-    [:SIGNATURE, "E4TZJVQ3ZHY9KBB681FDZX8F516NQ5S02R2SCMKNGY15AFY972X75C27VVZ5BV31ZRTKK6YWW1R76W43FSSCBEPRFWJ5TG39TJMGP08.sig.ed25519"],
+    [:SIGNATURE, "JSSFBAZ58Y73NPWZ912KYS0EZ1WA3V3FAG9VW2TF99B3Z0RH06Q52DS2AEBRPEZJFZWBA1Q4WYR7N19VVGRZ9KDFYAX64PCTA9BEW3G.sig.ed25519"],
    [:MESSAGE_END],
-    [:AUTHOR, "@VG44QCHKA38E7754RQ5DAFBMMD2CCZQRZ8BR2J4MRHHGVTHGW670.ed25519"],
-    [:KIND, "aca35bce-12b4-4c67-8e06-f62e5b97c7aa"],
-    [:PREV, "%3AG0M4483SPP3GCERE25RWZF50Y8CYCJANC2SRNHT4X1N1S37110.sha256"],
-    [:DEPTH, 9],
-    [:LIPMAA, Pigeon::Helpers.lipmaa(9)],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "541368e0-3bbc-4408-a743-c649d88e2547"],
+    [:PREV, "%9TVN1WPETZFEDJ49V2B2KFQ7VC58ERWYSJ0SWCFM1A7KBCTYP0X0.sha256"],
+    [:DEPTH, 7],
+    [:LIPMAA, 6],
    [:HEADER_END],
-    [:BODY_ENTRY, "foo", "\"123\""],
+    [:BODY_ENTRY, "foo", "\"fb97ba07-d037-4550-a5ca-ec63ad91109c\""],
    [:BODY_END],
-    [:SIGNATURE, "3NWJ65FGX914DDHWSF17BMAWKMDDMP4D0661WZK0Y928RB927N8NM2CGK9Y5P8RYGQ2FRGETSQYY5HQX2SKBT81ETRKVB3X56YBGC1G.sig.ed25519"],
+    [:SIGNATURE, "BFVWMHGZ2Z8GDWGRVJP989DGCR3B4TFNSW6T5VVNS5P0EMFCTXYB583A5V4AVD4DGTWHSGA67N52VP2AS3MEBYM7BQXH4YYAMAK2W1R.sig.ed25519"],
+    [:MESSAGE_END],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "c8f2c09f-91f2-48db-b02d-8d9503a7fcd8"],
+    [:PREV, "%XFS3B295588XMP91TM50TPGK78WP8KXESSWAG2BHTSZAFCRDDXFG.sha256"],
+    [:DEPTH, 8],
+    [:LIPMAA, 4],
+    [:HEADER_END],
+    [:BODY_ENTRY, "foo", "\"a511ac1e-089f-4876-8493-d0d827760515\""],
+    [:BODY_END],
+    [:SIGNATURE, "YRCG26YGM4TB89K96H6HXZNH0ZXHQB2R8P5FSZ8EHG4GDK1X80BV3GN6S7PW4XNWZPFVDQES4TC5AVRB7D17MF21H86QB58DAKHX210.sig.ed25519"],
+    [:MESSAGE_END],
+    [:AUTHOR, "@78V80T9Q7862GW5KTNGSDBKMSA53WE98G8TGFDS6HC9HEABFD64G.ed25519"],
+    [:KIND, "51c783e4-8729-4e73-9d31-e16db8605004"],
+    [:PREV, "%4PE7S4XCCAYPQ42S98K730CEW6ME5HRWJKHHEGYVYPFHSJWXEY1G.sha256"],
+    [:DEPTH, 9],
+    [:LIPMAA, 8],
+    [:HEADER_END],
+    [:BODY_ENTRY, "foo", "\"bar\""],
+    [:BODY_END],
+    [:SIGNATURE, "BBE732XXZ33XTCW1CRA9RG13FQ0FVMR61SAHD621VH8C64B4WA8C86JSTTAHG4CSGNBJJ7YSAVRF3YEBX6GTEB6RRWGDA84VJZPMR3R.sig.ed25519"],
    [:MESSAGE_END],
  ]

@ -127,7 +127,6 @@ RSpec.describe Pigeon::Lexer do
  end

  it "tokenizes a bundle" do
-    pending("Must fix this last")
    bundle = File.read("./spec/fixtures/normal.bundle")
    tokens = Pigeon::Lexer.tokenize(bundle)
    EXPECTED_TOKENS1.each_with_index do |item, i|
--- a/spec/pigeon/parser_spec.rb
+++ b/spec/pigeon/parser_spec.rb
@ -23,7 +23,6 @@ RSpec.describe Pigeon::Lexer do
  ]

  it "parses tokens" do
-    pending("Fix this last, after all *.bundle fixtures are fixed.")
    results = Pigeon::Parser.parse(tokens)
    expect(results.length).to eq(10)
    expect(results.first).to be_kind_of(Pigeon::Message)
@ -31,7 +30,6 @@ RSpec.describe Pigeon::Lexer do
  end

  it "ingests and reconstructs a bundle" do
-    pending("Must fix this last")
    messages = Pigeon::Bundle.ingest("./spec/fixtures/normal.bundle")
    expect(messages.length).to eq(10)
    expect(messages.map(&:class).uniq).to eq([Pigeon::Message])
--- a/spec/pigeon/storage_spec.rb
+++ b/spec/pigeon/storage_spec.rb
@ -51,7 +51,6 @@ RSpec.describe Pigeon::Storage do
  end

  it "finds all authored by a particular feed" do
-    pending("Fix last")
    ingested_messages = Pigeon::Bundle.ingest("./spec/fixtures/normal.bundle")
    author = ingested_messages.first.author.multihash
    actual_messages = Pigeon::Storage.current.find_all(author)