Merge branch 'test_txn_plugin_params' of https://github.com/eosnetwor…

…kfoundation/mandel into test_txn_plugin_params
eosnetworkfoundation · Jun 9, 2022 · d8f92da · d8f92da
2 parents 89c698e + 786b7bc
commit d8f92da
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/libraries/chain/include/eosio/chain/chain_snapshot.hpp b/libraries/chain/include/eosio/chain/chain_snapshot.hpp
@@ -22,10 +22,11 @@ struct chain_snapshot_header {
     *         - Configurable wasm limits
     *   5: Updated for v3.0.0 eos features:
     *         - chain_config update
+    *   6: Updated for v3.1.0 eos mandel release
     */
 
    static constexpr uint32_t minimum_compatible_version = 2;
-   static constexpr uint32_t current_version = 5;
+   static constexpr uint32_t current_version = 6;
 
    uint32_t version = current_version;
 

diff --git a/scripts/pinned_build.sh b/scripts/pinned_build.sh
@@ -80,7 +80,7 @@ install_llvm() {
       try tar -xvf llvm-${LLVM_VER}.src.tar.xz
       pushdir "${LLVM_DIR}.src"
       pushdir build
-      try cmake -DCMAKE_TOOLCHAIN_FILE=${SCRIPT_DIR}/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=${LLVM_DIR} -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=Off -DLLVM_ENABLE_RTTI=On -DLLVM_ENABLE_TERMINFO=Off -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO ..
+      try cmake -DCMAKE_TOOLCHAIN_FILE=${SCRIPT_DIR}/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=${LLVM_DIR} -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TOOLS=Off -DLLVM_ENABLE_RTTI=On -DLLVM_ENABLE_TERMINFO=Off -DCMAKE_EXE_LINKER_FLAGS=-pthread -DCMAKE_SHARED_LINKER_FLAGS=-pthread -DLLVM_ENABLE_PIC=NO ..
       try make -j${JOBS} 
       try make -j${JOBS} install
       popdir "${LLVM_DIR}.src"

diff --git a/unittests/snapshot_tests.cpp b/unittests/snapshot_tests.cpp
@@ -392,10 +392,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_compatible_versions, SNAPSHOT_SUITE, snapshot
    bfs::copy(source_log_dir / "blocks.log", config.blocks_dir / "blocks.log");
    tester base_chain(config, *genesis);
 
-   std::string current_version = "v5";
+   std::string current_version = "v6";
 
    int ordinal = 0;
-   for(std::string version : {"v2", "v3", "v4" , "v5"})
+   for(std::string version : {"v2", "v3", "v4" , "v5", "v6"})
    {
       if(save_snapshot && version == current_version) continue;
       static_assert(chain_snapshot_header::minimum_compatible_version <= 2, "version 2 unit test is no longer needed.  Please clean up data files");

diff --git a/unittests/snapshots/CMakeLists.txt b/unittests/snapshots/CMakeLists.txt
@@ -10,3 +10,5 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v4.bin.gz ${CMAKE_CURRENT_BINAR
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v4.json.gz  ${CMAKE_CURRENT_BINARY_DIR}/snap_v4.json.gz  COPYONLY )
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v5.bin.gz ${CMAKE_CURRENT_BINARY_DIR}/snap_v5.bin.gz COPYONLY )
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v5.json.gz  ${CMAKE_CURRENT_BINARY_DIR}/snap_v5.json.gz  COPYONLY )
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v6.bin.gz ${CMAKE_CURRENT_BINARY_DIR}/snap_v6.bin.gz COPYONLY )
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/snap_v6.json.gz  ${CMAKE_CURRENT_BINARY_DIR}/snap_v6.json.gz  COPYONLY )
diff --git a/unittests/snapshots/snap_v6.bin.gz b/unittests/snapshots/snap_v6.bin.gz
diff --git a/unittests/snapshots/snap_v6.json.gz b/unittests/snapshots/snap_v6.json.gz