Merge branch 'master' into pvl/attr-fix

DeFiCh · Aug 19, 2023 · 1c085e7 · 1c085e7
2 parents b813ae2 + bd26493
commit 1c085e7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/ain-evm/src/evm.rs b/lib/ain-evm/src/evm.rs
@@ -505,7 +505,7 @@ impl EVMServices {
             None => {}
             Some(account) => {
                 if account.code_hash != ain_contracts::get_system_reserved_codehash()? {
-                    return Err(format_err!("Token address is already in use").into());
+                    debug!("Token address is already in use for {name} {symbol}");
                 }
             }
         }

diff --git a/src/test/setup_common.h b/src/test/setup_common.h
@@ -15,7 +15,7 @@
 
 #include <type_traits>
 #include <vector>
-#include <boost/test/output_test_stream.hpp>
+#include <boost/test/tools/output_test_stream.hpp>
 
 // Enable BOOST_CHECK_EQUAL for enum class types
 template <typename T>

diff --git a/test/lint/lint-includes.sh b/test/lint/lint-includes.sh
@@ -74,7 +74,7 @@ EXPECTED_BOOST_INCLUDES=(
     boost/signals2/last_value.hpp
     boost/signals2/signal.hpp
     boost/test/unit_test.hpp
-    boost/test/output_test_stream.hpp
+    boost/test/tools/output_test_stream.hpp
 )
 
 for BOOST_INCLUDE in $(git grep '^#include <boost/' -- "*.cpp" "*.h" | cut -f2 -d: | cut -f2 -d'<' | cut -f1 -d'>' | sort -u); do