fix update to new codec sigils

Signed-off-by: Dave Huseby <[email protected]>

Author: dhuseby

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "multicid"
-version = "1.0.3"
+version = "1.0.4"
 edition = "2021"
 authors = ["Dave Grantham <[email protected]>"]
 description = "Multicodec compatible content identifier implementation"

src/serde/mod.rs

@@ -258,7 +258,7 @@ mod tests {
 
         assert_tokens(
             &vlad.readable(),
-            &[Token::BorrowedStr("ba45sbuk4j6zjcgxbgn7rak6k6taardjwgrnyrmsds2higtc77ilza6bsafyriqcxslnnsyefwydwxdsomo2xrsinam3lzkw66tzeobg7qzqusutkdzwsh6e6egfnh5qxfj7cnzxdpi66u4uol4rs4qljnljinpgksia34"),
+            &[Token::BorrowedStr("bq4slwjba2foe7murdlqtg7yqfpfpjqairu3diw4iwjbzndudjrp7uf4qpazac4iuiblzfwwzmcc3mb3lrzhghnlyzegqgnv4vlppj4shatpymykjkjvb43jd7cpcdcwt6ylsu7rg43rxuppkokhf6izoifuwvuugxtfjean6"),
             ],
         );
     }
@@ -382,7 +382,7 @@ mod tests {
 
         let v = serde_cbor::to_vec(&vlad).unwrap();
         //println!("serde_cbor vlad: {}", hex::encode(&v));
-        assert_eq!(v, hex::decode("5867073b20d15c4fb2911ae1337f102bcaf4c0088d36345b88b243968e834c5ffa17907832017114405792dad96085b6076b8e4e63b578c90d0336bcaadef4f24704df866149526a1e6d23f89e218ad3f6172a7e26e6e37a3dea728e5f232e41696ad286bcca9201be").unwrap());
+        assert_eq!(v, hex::decode("58698724bb2420d15c4fb2911ae1337f102bcaf4c0088d36345b88b243968e834c5ffa17907832017114405792dad96085b6076b8e4e63b578c90d0336bcaadef4f24704df866149526a1e6d23f89e218ad3f6172a7e26e6e37a3dea728e5f232e41696ad286bcca9201be").unwrap());
         assert_eq!(vlad, serde_cbor::from_slice(&v).unwrap());
     }
 
@@ -468,7 +468,7 @@ mod tests {
         assert_tokens(
             &v.compact(),
             &[
-                Token::BorrowedBytes(&[0x07, 0x3b, 0x00, 0x01, 0x00, 0x00, 0x00]),
+                Token::BorrowedBytes(&[135, 36, 187, 36, 0, 1, 0, 0, 0]),
             ]
         );
     }
@@ -510,7 +510,7 @@ mod tests {
         assert_tokens(
             &v.readable(),
             &[
-                Token::BorrowedStr("ba45qaaiaaaaa"),
+                Token::BorrowedStr("bq4slwjaaaeaaaaa"),
             ]
         );
     }

src/vlad.rs

@@ -337,23 +337,23 @@ mod tests {
     #[test]
     fn test_naked_encodings() {
         let naked_encoded = vec![
-            (Base::Base2, "00000111001110110010000010101101010101110101001111101110010011000000100001110101101011100000010100101011011011000100111111010001010010010001010001110100010110001100000001110101110010001001010101101101000111101001001110110100101011010011000111001010111000110100101011100010111001100000000101110001000101000100000001010111100100101101101011011001011000001000010110110110000001110110101110001110010011100110001110110101011110001100100100001101000000110011011010111100101010101101111011110100111100100100011100000100110111111000011001100001010010010101001001101010000111100110110100100011111110001001111000100001100010101101001111110110000101110010101001111110001001101110011011100011011110100011110111101010011100101000111001011111001000110010111001000001011010010110101011010010100001101011110011001010100100100000000110111110"),
-            (Base::Base8, "01635440532535237344601035327005126661176424442435054300353442253321722355126461625615127056300134212100257113326626020555403553434471435527431103201466571253367517110701157606302445223241715510774236103053237541345237423346706750757247121627621456202645526450327462511001574"),
-            (Base::Base10, "3159896538572941552300237467498239240230991094809220818669996208403756627333440284950116478852282558426450173929503136577705156387666971927483177444527629374454471997041770248911157995781224129392264907918430937825252959411085792202002484276887998"),
-            (Base::Base16Lower, "073b203e9e75230920469f4f2fb703447fb6451b66eef3c7bf2f376bc05d9fd147ae60017114405792dad96085b6076b8e4e63b578c90d0336bcaadef4f24704df866149526a1e6d23f89e218ad3f6172a7e26e6e37a3dea728e5f232e41696ad286bcca9201be"),
-            (Base::Base16Upper, "073B20BFA0561070F9B1963193361880319E93E80267D904BB19C9BBD1E64141A01351017114405792DAD96085B6076B8E4E63B578C90D0336BCAADEF4F24704DF866149526A1E6D23F89E218AD3F6172A7E26E6E37A3DEA728E5F232E41696AD286BCCA9201BE"),
-            (Base::Base32Lower, "a45sapu6ourqsicgt5hs7nydir73mri3m3xphr57f43wxqc5t7iupltaafyriqcxslnnsyefwydwxdsomo2xrsinam3lzkw66tzeobg7qzqusutkdzwsh6e6egfnh5qxfj7cnzxdpi66u4uol4rs4qljnljinpgksia34"),
-            (Base::Base32Upper, "A45SAPU6OURQSICGT5HS7NYDIR73MRI3M3XPHR57F43WXQC5T7IUPLTAAFYRIQCXSLNNSYEFWYDWXDSOMO2XRSINAM3LZKW66TZEOBG7QZQUSUTKDZWSH6E6EGFNH5QXFJ7CNZXDPI66U4UOL4RS4QLJNLJINPGKSIA34"),
-            (Base::Base32HexLower, "0sti0fkuekhgi826jt7ivdo38hvrch8rcrnf7htv5srmng2tjv8kfbj005oh8g2nibddio45mo3mn3ieceqnhi8d0crbpamuujp4e16vgpgkikja3pmi7u4u465d7tgn59v2dpn3f8uukskebshisgb9db98df6ai80rs"),
-            (Base::Base32HexUpper, "0STI0FKUEKHGI826JT7IVDO38HVRCH8RCRNF7HTV5SRMNG2TJV8KFBJ005OH8G2NIBDDIO45MO3MN3IECEQNHI8D0CRBPAMUUJP4E16VGPGKIKJA3PMI7U4U465D7TGN59V2DPN3F8UUKSKEBSHISGB9DB98DF6AI80RS"),
-            (Base::Base32Z, "yh71yxw6qwto1engu7819padet95cte5c5zx8t79fh5szon7u9ewxmuyyfateonz1mpp1arfsadszd1qcq4zt1epyc5m3ks66u3rqbg9o3ow1wukd3s186r6rgfp87ozfj9np3zdxe66whwqmht1homjpmjepxgk1ey5h"),
-            (Base::Base36Lower, "40lqkyrdflt5v9goe8qxj6v8om6uxyo6iybtcvwxzwmvla5jsgml8cgwg6a3xa7njoxzp468s6m0y8p6ao34ju25n0pq4ufqgta4mnzdndn1lfrfu2oznv4ahta8bsg2oqalj92no7qvtscymndyc9u2rtuacvy"),
-            (Base::Base36Upper, "40LQR8EHJ6ME58F065O9TNCQ3T2ZWFYGCRG6L8O8A1EJI7FS8GEKPH2FMBOMIZQS37C38GAUL9H647S6AYUPCMDQFPQSEX5HDAPQGCE2FHI11GPD5KO0TSJ2H99M2RNEOC2LY0UV77A2G7HNELBDU4XWODJJZJY"),
-            (Base::Base58Flickr, "qay7kq5wDXCsRyvdbDwvtZYGNjcuSYuTsyaCQpjkHt9subP7qmVoBLMfbhr4vDFhBDR98bZVWDQ8ZLT4zakLhCRwhzH2FRNxRtXV57X5pEaWF447Ea2NUZnsSCk5bQqz4xrkufEogbbs"),
-            (Base::Base58Btc, "RAZ7SAQ7ePhs1oGoUSnwJgdHSY4SVaKtBHd4Z7LgYihSJ14FAGHMi331doB5Sz8pK5kdLWokERTFqJd1gYjt56z5WkxZ86FXwcd5PbqdRqfvWgyimXRThMfLfFw9H7yPLLyrUE3TyHU1"),
-            (Base::Base64, "BzsgPp51IwkgRp9PL7cDRH+2RRtm7vPHvy83a8Bdn9FHrmABcRRAV5La2WCFtgdrjk5jtXjJDQM2vKre9PJHBN+GYUlSah5tI/ieIYrT9hcqfibm43o96nKOXyMuQWlq0oa8ypIBvg"),
-            (Base::Base64Url, "BzsgPp51IwkgRp9PL7cDRH-2RRtm7vPHvy83a8Bdn9FHrmABcRRAV5La2WCFtgdrjk5jtXjJDQM2vKre9PJHBN-GYUlSah5tI_ieIYrT9hcqfibm43o96nKOXyMuQWlq0oa8ypIBvg"),
-            (Base::Base256Emoji, "🌓🤷😅🌞🤩🦋😄🤘😟😏👶🌚✋👈🙂💣🌟🏆🎊💘⚡💕😚👉⚠✅😉🎵🤝🌹😬🤤⚠⚽🙊🪐✅💾😋😑🌼😗🍒😥🖕🤬🌓🙃🤞👇💃💨😣🦋🌍🛰🤦💟😰🐷👻👐🤩🌌☎💝🤤😀❣😬😘🌷🔥🥵🐶👏💫🤧🤮❤😆😠💖🍑👆💐😌🐸🥺🤞🥳🔥☺💗🌟😬🤠💝💟😷🌼🪐😖")
+            (Base::Base2, "0100001110010010010111011001001000010000010101011111101010101001010111011011010101100111011110001011001010000011011111110011110101111000001110010110111101101010001100011010111111110100101011000010111000010011101101111000001111111100011100000001011001011101000101111111111001001001110010010001000000000000101110001000101000100000001010111100100101101101011011001011000001000010110110110000001110110101110001110010011100110001110110101011110001100100100001101000000110011011010111100101010101101111011110100111100100100011100000100110111111000011001100001010010010101001001101010000111100110110100100011111110001001111000100001100010101101001111110110000101110010101001111110001001101110011011100011011110100011110111101010011100101000111001011111001000110010111001000001011010010110101011010010100001101011110011001010100100100000000110111110"),
+            (Base::Base8, "74162227311020253752512733254736131203376365701626755214327764530270235570177434013135057771116221000056105040127445553313010266601665616234616653614441500633274525573647444340467703141222511520746644376117041425517660562517611563343364367523450713710627101322653224153631244400676"),
+            (Base::Base10, "93870361154591786056205491493019802388883700996012441049219964638855824516737171088563397435615501486404979067615946505439444354740858725022007675555169022360610124101489649907289941930351813344284767475896642016737913366109253497871106880676932034363838"),
+            (Base::Base16Lower, "f8724bb2420abf552bb6acef16506fe7af072ded4635fe9585c276f07f8e02cba2ffc939220017114405792dad96085b6076b8e4e63b578c90d0336bcaadef4f24704df866149526a1e6d23f89e218ad3f6172a7e26e6e37a3dea728e5f232e41696ad286bcca9201be"),
+            (Base::Base16Upper, "F8724BB2420ABF552BB6ACEF16506FE7AF072DED4635FE9585C276F07F8E02CBA2FFC939220017114405792DAD96085B6076B8E4E63B578C90D0336BCAADEF4F24704DF866149526A1E6D23F89E218AD3F6172A7E26E6E37A3DEA728E5F232E41696AD286BCCA9201BE"),
+            (Base::Base32Lower, "bq4slwjbavp2vfo3kz3ywkbx6plyhfxwumnp6swc4e5xqp6hafs5c77etsiqac4iuiblzfwwzmcc3mb3lrzhghnlyzegqgnv4vlppj4shatpymykjkjvb43jd7cpcdcwt6ylsu7rg43rxuppkokhf6izoifuwvuugxtfjean6"),
+            (Base::Base32Upper, "BQ4SLWJBAVP2VFO3KZ3YWKBX6PLYHFXWUMNP6SWC4E5XQP6HAFS5C77ETSIQAC4IUIBLZFWWZMCC3MB3LRZHGHNLYZEGQGNV4VLPPJ4SHATPYMYKJKJVB43JD7CPCDCWT6YLSU7RG43RXUPPKOKHF6IZOIFUWVUUGXTFJEAN6"),
+            (Base::Base32HexLower, "vgsibm910lfql5eraproma1nufbo75nmkcdfuim2s4tngfu705it2vv4ji8g02s8k81bp5mmpc22rc1rbhp767dbop46g6dlslbff9si70jfocoa9a9l1sr93v2f232mjuobikvh6srhnkffaea75u8pe85kmlkk6nj5940du"),
+            (Base::Base32HexUpper, "VGSIBM910LFQL5ERAPROMA1NUFBO75NMKCDFUIM2S4TNGFU705IT2VV4JI8G02S8K81BP5MMPC22RC1RBHP767DBOP46G6DLSLBFF9SI70JFOCOA9A9L1SR93V2F232MJUOBIKVH6SRHNKFFAEA75U8PE85KMLKK6NJ5940DU"),
+            (Base::Base32Z, "hoh1msjbyix4ifq5k35askbz6xma8fzswcpx61snhr7zox68yf17n99ru1eoynhewebm3fss3cnn5cb5mt38g8pma3rgogpihimxxjh18yuxacakjkjibh5jd9nxndnsu6am1w9tgh5tzwxxkqk8f6e3qefwsiwwgzufjryp6"),
+            (Base::Base36Lower, "k2xg7x2wm1ycnm2wxuc7edrtm3dz5t7pdojs7qbocom1bg2pzd8vicjuqe8e245npjpvvxtfxfn6qbhvtvkjyxxjccnr6kvnwwa225l8cvyvlv4p8qimjro6awa592cwywrg3ul3lg8orcamiff1jvvi25t4g7698ipq"),
+            (Base::Base36Upper, "K2XG7X2WM1YCNM2WXUC7EDRTM3DZ5T7PDOJS7QBOCOM1BG2PZD8VICJUQE8E245NPJPVVXTFXFN6QBHVTVKJYXXJCCNR6KVNWWA225L8CVYVLV4P8QIMJRO6AWA592CWYWRG3UL3LG8ORCAMIFF1JVVI25T4G7698IPQ"),
+            (Base::Base58Flickr, "Z3BGq28L4k5syJ5FyzPmBM7pCAYPMKeU1mmgAJcCUSZyBgzMinFA9hxFcDZ65C966no9uGF4C9UqsCmU975d8Bt95XGfZrNTgrWuwPycYHsGn5jyrnaWJtCryzzZErsaffckdav4C42g9bnzy"),
+            (Base::Base58Btc, "z3chR28m4L5TZj5gZapMcn7QdbypnkEu1MMGbjCduszZcGanJNgb9HYgCez65d966NP9Vhg4d9uRTdMu975D8cU95xhFzSotGSwVXpZCyiThN5KZSNAwjUdSZaazfSTAFFCLDAW4d42G9BNaZ"),
+            (Base::Base64, "mhyS7JCCr9VK7as7xZQb+evBy3tRjX+lYXCdvB/jgLLov/JOSIAFxFEBXktrZYIW2B2uOTmO1eMkNAza8qt708kcE34ZhSVJqHm0j+J4hitP2Fyp+Jubjej3qco5fIy5BaWrShrzKkgG+"),
+            (Base::Base64Url, "uhyS7JCCr9VK7as7xZQb-evBy3tRjX-lYXCdvB_jgLLov_JOSIAFxFEBXktrZYIW2B2uOTmO1eMkNAza8qt708kcE34ZhSVJqHm0j-J4hitP2Fyp-Jubjej3qco5fIy5BaWrShrzKkgG-"),
+            (Base::Base256Emoji, "🚀🙊🥰😙🥰😅🤨🤐❣😙😬😟💩✋🌒📣💐💡🥺🐷📌💃🥳💣💥😡💙😓🌓🥵💧💪🤓👌👼😫🌼😅🪐✅💾😋😑🌼😗🍒😥🖕🤬🌓🙃🤞👇💃💨😣🦋🌍🛰🤦💟😰🐷👻👐🤩🌌☎💝🤤😀❣😬😘🌷🔥🥵🐶👏💫🤧🤮❤😆😠💖🍑👆💐😌🐸🥺🤞🥳🔥☺💗🌟😬🤠💝💟😷🌼🪐😖")
         ];
 
         for naked in naked_encoded {
@@ -378,7 +378,7 @@ mod tests {
             .try_build()
             .unwrap();
 
-        let s = "bhkasmcdumvzxiidlmv4qcaja42hlepmnedftr7ibzzo56qaswo6jvdmypljivo3b3imhjxqfnsvq";
+        let s = "fba2480260874657374206b657901012064e58adf88f85cbec6a0448a0803f9d28cf9231a7141be413f83cf6aa883cd04";
         let mk = EncodedMultikey::try_from(s).unwrap();
 
         let vlad = Builder::default()