Fixed tests

firoorg · Nov 18, 2023 · 01f847e · 01f847e
1 parent 2408980
commit 01f847e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/base58.h b/src/base58.h
@@ -117,7 +117,7 @@ class CBitcoinAddress : public CBase58Data {
     CBitcoinAddress(const CTxDestination &dest) { Set(dest); }
     CBitcoinAddress(const std::string& strAddress) {
         SetString(strAddress);
-        if (!IsValid()) {
+        if (vchData.size() != 20) {
             // give the address second chance and try exchange address format with 3 byte prefix
             SetString(strAddress.c_str(), 3);
         }

diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json
@@ -270,7 +270,7 @@
 ["0", "IF 0xdd ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
 ["0", "IF 0xde ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
 ["0", "IF 0xdf ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
-["0", "IF 0xe0 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+
 ["0", "IF 0xe1 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
 ["0", "IF 0xe2 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
 ["0", "IF 0xe3 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
@@ -908,7 +908,6 @@
 ["1", "IF 0xdd ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
 ["1", "IF 0xde ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
 ["1", "IF 0xdf ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
-["1", "IF 0xe0 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
 ["1", "IF 0xe1 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
 ["1", "IF 0xe2 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
 ["1", "IF 0xe3 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],