test: update signmessage related tests

bitcoin · Mar 4, 2020 · b5248e4 · b5248e4
1 parent ab61f4f
commit b5248e4
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
@@ -12,7 +12,8 @@
 #include <test/util/setup_common.h>
 #include <test/util/str.h>
 #include <uint256.h>
-#include <util/message.h> // For MessageSign(), MessageVerify(), MESSAGE_MAGIC
+#include <util/message.h> // For MessageSign(), MessageVerify()
+#include <script/proof.h> // For MESSAGE_MAGIC
 #include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/string.h>
@@ -2082,13 +2083,6 @@ BOOST_AUTO_TEST_CASE(message_verify)
             "message too"),
         MessageVerificationResult::ERR_INVALID_ADDRESS);
 
-    BOOST_CHECK_EQUAL(
-        MessageVerify(
-            "3B5fQsEXEaV8v6U3ejYc8XaKXAkyQj2MjV",
-            "signature should be irrelevant",
-            "message too"),
-        MessageVerificationResult::ERR_ADDRESS_NO_KEY);
-
     BOOST_CHECK_EQUAL(
         MessageVerify(
             "1KqbBpLy5FARmTPD4VZnDDpYjkUvkr82Pm",
@@ -2101,14 +2095,7 @@ BOOST_AUTO_TEST_CASE(message_verify)
             "1KqbBpLy5FARmTPD4VZnDDpYjkUvkr82Pm",
             "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
             "message should be irrelevant"),
-        MessageVerificationResult::ERR_PUBKEY_NOT_RECOVERED);
-
-    BOOST_CHECK_EQUAL(
-        MessageVerify(
-            "15CRxFdyRpGZLW9w8HnHvVduizdL5jKNbs",
-            "IPojfrX2dfPnH26UegfbGQQLrdK844DlHq5157/P6h57WyuS/Qsl+h/WSVGDF4MUi4rWSswW38oimDYfNNUBUOk=",
-            "I never signed this"),
-        MessageVerificationResult::ERR_NOT_SIGNED);
+        MessageVerificationResult::ERR_MALFORMED_SIGNATURE);
 
     BOOST_CHECK_EQUAL(
         MessageVerify(