Merge pull request #1226 from evoskuil/version3

evoskuil · web-flow · commit da51bad4442a · 2021-04-15T02:23:47.000-07:00
Use language qualification from mnemonic test vectors.
diff --git a/test/wallet/mnemonic.cpp b/test/wallet/mnemonic.cpp
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(mnemonic__decode_mnemonic__bx)
     for (const auto& vector: mnemonic_bx_to_seed_vectors)
     {
         const auto words = split(vector.mnemonic, ",");
-        BOOST_REQUIRE(validate_mnemonic(words));
+        BOOST_REQUIRE(validate_mnemonic(words, vector.language));
         const auto seed = decode_mnemonic(words, vector.passphrase);
         BOOST_REQUIRE_EQUAL(encode_base16(seed), vector.seed);
     }
@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(mnemonic__create_mnemonic__bx)
         const auto mnemonic = create_mnemonic(entropy, vector.language);
         BOOST_REQUIRE(mnemonic.size() > 0);
         BOOST_REQUIRE_EQUAL(join(mnemonic, ","), vector.mnemonic);
-        BOOST_REQUIRE(validate_mnemonic(mnemonic));
+        BOOST_REQUIRE(validate_mnemonic(mnemonic, vector.language));
     }
 }
 
diff --git a/test/wallet/mnemonic.hpp b/test/wallet/mnemonic.hpp
@@ -223,7 +223,7 @@ const mnemonic_result_list mnemonic_bx_to_seed_vectors
             "previo,humilde,actuar,jarabe,tabique,ahorro,tope,pulpo,anís,señal,lavar,bahía",
             "博 肉 地 危 惜 多 陪 荒 因 患 伊 基",
             "e72505021b97e15171fe09e996898888579c4196c445d7629762c5b09586e3fb3d68380120b8d8a6ed6f9a73306dab7bf54127f3a610ede2a2d5b4e59916ac73",
-            bc::wallet::language::en
+            bc::wallet::language::es
         }
     }
 };

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(mnemonic__decode_mnemonic__bx)`
`56`	`56`	`for (const auto& vector: mnemonic_bx_to_seed_vectors)`
`57`	`57`	`{`
`58`	`58`	`const auto words = split(vector.mnemonic, ",");`
`59`		`- BOOST_REQUIRE(validate_mnemonic(words));`
	`59`	`+ BOOST_REQUIRE(validate_mnemonic(words, vector.language));`
`60`	`60`	`const auto seed = decode_mnemonic(words, vector.passphrase);`
`61`	`61`	`BOOST_REQUIRE_EQUAL(encode_base16(seed), vector.seed);`
`62`	`62`	`}`
`@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(mnemonic__create_mnemonic__bx)`
`86`	`86`	`const auto mnemonic = create_mnemonic(entropy, vector.language);`
`87`	`87`	`BOOST_REQUIRE(mnemonic.size() > 0);`
`88`	`88`	`BOOST_REQUIRE_EQUAL(join(mnemonic, ","), vector.mnemonic);`
`89`		`- BOOST_REQUIRE(validate_mnemonic(mnemonic));`
	`89`	`+ BOOST_REQUIRE(validate_mnemonic(mnemonic, vector.language));`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ const mnemonic_result_list mnemonic_bx_to_seed_vectors`
`223`	`223`	`"previo,humilde,actuar,jarabe,tabique,ahorro,tope,pulpo,anís,señal,lavar,bahía",`
`224`	`224`	`"博肉地危惜多陪荒因患伊基",`
`225`	`225`	`"e72505021b97e15171fe09e996898888579c4196c445d7629762c5b09586e3fb3d68380120b8d8a6ed6f9a73306dab7bf54127f3a610ede2a2d5b4e59916ac73",`
`226`		`- bc::wallet::language::en`
	`226`	`+ bc::wallet::language::es`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`	`};`