moving bech32 impl to contrib folder and updating tests after changing default algo in previous commit

Author: george-larionov

contrib/CMakeLists.txt

@@ -248,6 +248,7 @@ add_contrib (jwt-cpp-cmake jwt-cpp)
 
 add_contrib (sha3iuf-cmake SHA3IUF)
 
+add_contrib (bech32)
 
 # Put all targets defined here and in subdirectories under "contrib/<immediate-subdir>" folders in GUI-based IDEs.
 # Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they would not appear

contrib/bech32/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_library(_bech32
+    include/bech32.h
+    src/bech32.cpp)
+
+target_include_directories(_bech32 PUBLIC include)
+target_include_directories(_bech32 PRIVATE src)
+
+add_library(ch_contrib::bech32 ALIAS _bech32)

contrib/bech32/LICENSE-MIT

@@ -0,0 +1,19 @@
+Copyright (c) 2017, 2021 Pieter Wuille
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Functions/bech32.h renamed to contrib/bech32/include/bech32.h

@@ -61,6 +61,7 @@ list (APPEND PRIVATE_LIBS
         boost::filesystem
         divide_impl
         ch_contrib::xxHash
+        ch_contrib::bech32
 )
 
 if (TARGET OpenSSL::Crypto)

src/Functions/bech32.cpp renamed to contrib/bech32/src/bech32.cpp

@@ -6,7 +6,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 
-#include "bech32.h"
+#include <bech32.h>
 
 namespace
 {

src/Functions/CMakeLists.txt

@@ -1,24 +1,23 @@
-bc1w508d6qejxtdg4y5r3zarvary0c5xw7kj7gz7z
-tb1w508d6qejxtdg4y5r3zarvary0c5xw7kzp034v
-bc1w508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5hkya85
-bcrt17capp7
-bcrt1w508d6qejxtdg4y5r3zarvary0c5xw7kkedzxp
-tltc1w508d6qejxtdg4y5r3zarvary0c5xw7kkzve4x
-tltssdfsdvjnasdfnjkbhksdfasnbdfkljhaksdjfnakjsdhasdfnasdkfasdfasdfasdf1w50qsz2tg5
+bc1w508d6qejxtdg4y5r3zarvary0c5xw7k8zcwmq
+tb1w508d6qejxtdg4y5r3zarvary0c5xw7khalasw
+bc1w508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5z253zk
+bcrt1tyddyu
+bcrt1w508d6qejxtdg4y5r3zarvary0c5xw7kr9awrr
+tltc1w508d6qejxtdg4y5r3zarvary0c5xw7kr7u4sy
+tltssdfsdvjnasdfnjkbhksdfasnbdfkljhaksdjfnakjsdhasdfnasdkfasdfasdfasdf1w50q9768dk
 
 
-bc1w508d6qejxtdg4y5r3zarvary0c5xw7kj7gz7z
+bc1w508d6qejxtdg4y5r3zarvary0c5xw7k8zcwmq
 
 1
-bc1w508d6qejxtdg4y5r3zarvary0c5xw7k8zcwmq
-tb1w508d6qejxtdg4y5r3zarvary0c5xw7khalasw
+bc1w508d6qejxtdg4y5r3zarvary0c5xw7kj7gz7z
 1
 bc	751E76E8199196D454941C45D1B3A323F1433BD6
-bc1v6r3z2nw4k6d3rffc7j9mftwluxz8v8pfe6h6sywtwyntp	bc1v6r3z2nw4k6d3rffc7j9mftwluxz8v8pfe6h6sywtwyntp	1	1	1
-tb137xd6smyhd7u5ywyjapa5tzt2srzlgpc3wleysrcm8ghua	tb137xd6smyhd7u5ywyjapa5tzt2srzlgpc3wleysrcwmcmel	1	1	1
-bc12zuq63wvya0nd66lktpz4ylk5n5rh2fcpe2uvlm2d3sc77	bc12zuq63wvya0nd66lktpz4ylk5n5rh2fcpe2uvlm2cdq5mu	1	1	1
-tb1kyp6rymudchmnhns0f97qt2a883p0d9u5l8re8qjv988g7	tb1kyp6rymudchmnhns0f97qt2a883p0d9u5l8re8qjv988g7	1	1	1
-bcrt1jh4nxnlc9mu26as4rs5sjj4a4ekfazacy3zj8c68mq5ghf	bcrt1jh4nxnlc9mu26as4rs5sjj4a4ekfazacy3zj8c68wuyyjt	1	1	1
+bc1v6r3z2nw4k6d3rffc7j9mftwluxz8v8pfe6h6syw7j5lwr	bc1v6r3z2nw4k6d3rffc7j9mftwluxz8v8pfe6h6sywtwyntp	1	1	1
+tb137xd6smyhd7u5ywyjapa5tzt2srzlgpc3wleysrcwmcmel	tb137xd6smyhd7u5ywyjapa5tzt2srzlgpc3wleysrcwmcmel	1	1	1
+bc12zuq63wvya0nd66lktpz4ylk5n5rh2fcpe2uvlm2cdq5mu	bc12zuq63wvya0nd66lktpz4ylk5n5rh2fcpe2uvlm2cdq5mu	1	1	1
+tb1kyp6rymudchmnhns0f97qt2a883p0d9u5l8re8qjeehtdu	tb1kyp6rymudchmnhns0f97qt2a883p0d9u5l8re8qjv988g7	1	1	1
+bcrt1jh4nxnlc9mu26as4rs5sjj4a4ekfazacy3zj8c68wuyyjt	bcrt1jh4nxnlc9mu26as4rs5sjj4a4ekfazacy3zj8c68wuyyjt	1	1	1
 bc	6687112a6eadb4d88d29c7a45da56eff0c23b0e14e757d408e	1	1
 tb	8f8cdd4364bb7dca11c49743da2c4b54062fa0388bbf924078	1	1
 bc	50b80d45cc275f36eb5fb2c22a93f6a4e83ba9380e55c67f6a	1	1

src/Functions/FunctionsBech32Representation.cpp

@@ -21,13 +21,12 @@ select bech32Encode('bc', unhex('751E76E8199196D454941C45D1B3A323F1433BD6'));
 -- 51 chars should return nothing
 select bech32Encode('', unhex('751e76e8199196d454941c45d1b3a323f1433bd6751e76e8199196d454941c45d1b3a323f1433bd6751e76e8199196d45494a'));
 
--- test with explicit witver = 0, should be same as default
-select bech32Encode('bc', unhex('751e76e8199196d454941c45d1b3a323f1433bd6'), 0) == 
+-- test with explicit witver = 1, should be same as default
+select bech32Encode('bc', unhex('751e76e8199196d454941c45d1b3a323f1433bd6'), 1) == 
        bech32Encode('bc', unhex('751e76e8199196d454941c45d1b3a323f1433bd6'));
 
--- testing bech32m algo
-select bech32Encode('bc', unhex('751e76e8199196d454941c45d1b3a323f1433bd6'), 1);
-select bech32Encode('tb', unhex('751e76e8199196d454941c45d1b3a323f1433bd6'), 2);
+-- testing old bech32 algo
+select bech32Encode('bc', unhex('751e76e8199196d454941c45d1b3a323f1433bd6'), 0);
 
 -- witversions >=1 should all be the same
 select bech32Encode('bc', unhex('751e76e8199196d454941c45d1b3a323f1433bd6'), 1) ==