Merge pull request #350 from eosnetworkfoundation/cc_bump_snapshots_t…

…o_v6 Bump snapshot version to v6
eosnetworkfoundation · Jun 8, 2022 · 4ef2e72 · 4ef2e72
2 parents d36cebd + aa28ece
commit 4ef2e72
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 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/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