IS-1426 extend test helpers; add consensus restart from db test for bite and non-bite builds

Author: PropzSaladaz

CMakeLists.txt

@@ -339,15 +339,16 @@ file(GLOB_RECURSE COMMON_TEST_SOURCES
         "tests/unit/db/*.cpp"
         "tests/consensus_tests.cpp"
         "tests/sgx_tests.cpp"
+        "tests/e2e/RestartBootstrapTests.cpp"
 )
 
 set(TEST_SOURCES ${COMMON_TEST_SOURCES})
 
 # Conditionally add rlp test sources if BITE is enabled
 if (DEFINED BITE)
-    file(GLOB_RECURSE BITE_TEST_SOURCES 
-        "tests/unit/bite/*.cpp"
-        "tests/e2e/ReencryptionRandomConsensusTests.cpp"
+    file(GLOB_RECURSE BITE_TEST_SOURCES "tests/unit/bite/*.cpp")
+    list(APPEND BITE_TEST_SOURCES
+        "tests/e2e/bite/ReencryptionRandomConsensusTests.cpp"
     )
     list(APPEND TEST_SOURCES ${BITE_TEST_SOURCES} libBLS/test/utils.cpp)
 

tests/e2e/ConsensusEngineTestAccess.h

@@ -6,6 +6,14 @@
 
 class ConsensusEngineTestAccess {
 public:
+    static node_id getFirstNodeId( const ConsensusEngine& e ) {
+        CHECK_STATE( e.nodes.size() > 0 );
+        auto it = e.nodes.begin();
+        CHECK_STATE( it != e.nodes.end() );
+        CHECK_STATE( it->second );
+        return it->first;
+    }
+
     static ptr<CommittedBlock> getCommittedBlockForBlockId(
         const ConsensusEngine& e, uint64_t id) {
 
@@ -42,4 +50,44 @@ class ConsensusEngineTestAccess {
         return block;
 
     }
+
+    static uint64_t getBootstrapBlockIDForNode( const ConsensusEngine& e, node_id node ) {
+        auto it = e.nodes.find( node );
+        CHECK_STATE2( it != e.nodes.end(), "Node with id " + to_string( node ) + " not found" );
+        CHECK_STATE( it->second );
+        auto schain = it->second->getSchain();
+        CHECK_STATE( schain );
+        return (uint64_t) schain->getBootstrapBlockID();
+    }
+
+    static uint64_t getBootstrapBlockID( const ConsensusEngine& e ) {
+        return getBootstrapBlockIDForNode( e, getFirstNodeId( e ) );
+    }
+
+    static block_id getCurrentLastCommittedBlockIDForNode( const ConsensusEngine& e, node_id node ) {
+        auto it = e.nodes.find( node );
+        CHECK_STATE2( it != e.nodes.end(), "Node with id " + to_string( node ) + " not found" );
+        CHECK_STATE( it->second );
+        auto schain = it->second->getSchain();
+        CHECK_STATE( schain );
+        return schain->getLastCommittedBlockID();
+    }
+
+    static block_id getCurrentLastCommittedBlockID( const ConsensusEngine& e ) {
+        return getCurrentLastCommittedBlockIDForNode( e, getFirstNodeId( e ) );
+    }
+
+    static TimeStamp getCurrentLastCommittedBlockTimeStampForNode(
+        const ConsensusEngine& e, node_id node ) {
+        auto it = e.nodes.find( node );
+        CHECK_STATE2( it != e.nodes.end(), "Node with id " + to_string( node ) + " not found" );
+        CHECK_STATE( it->second );
+        auto schain = it->second->getSchain();
+        CHECK_STATE( schain );
+        return schain->getLastCommittedBlockTimeStamp();
+    }
+
+    static TimeStamp getCurrentLastCommittedBlockTimeStamp( const ConsensusEngine& e ) {
+        return getCurrentLastCommittedBlockTimeStampForNode( e, getFirstNodeId( e ) );
+    }
 };

tests/e2e/E2ETestHelper.h

@@ -38,6 +38,7 @@ class E2ETestHelper {
     inline static const string TWO_NODE_TEST_DATA_DIR = TEST_DATA_ROOT_DIR + "/twonodes_sameip";
     static constexpr uint64_t DEFAULT_RUN_TIME_S = 4;
     static constexpr uint64_t CROSS_NODE_RUN_TIME_S = 20;
+    static constexpr uint64_t DEFAULT_STORAGE_LIMIT_BYTES = 1000000000;
 
     static void configureTestEnvironment(
         bool _cleanDataDir,
@@ -64,6 +65,38 @@ class E2ETestHelper {
         setTestEnvVar( "TEST_TIME_S", "4", 0 );
     }
 
+    static void startEngine(
+        ConsensusEngine*& _engine,
+        int64_t _lastId,
+        const std::map< string, uint64_t >& _patchTimestamps = {
+#ifdef BITE
+            { "bite2PatchTimestamp", 0 }
+#endif
+        },
+        ConsensusExtFace* _extFace = nullptr,
+        uint64_t _lastCommittedBlockTimeStamp = 0,
+        uint64_t _lastCommittedBlockTimeStampMs = 0,
+        bool _useBlockIDFromConsensus = false ) {
+        CATCH_REQUIRE( _engine == nullptr );
+
+        if ( _extFace != nullptr ) {
+            CATCH_REQUIRE( _lastId >= 0 );
+            _engine = new ConsensusEngine( *_extFace, (uint64_t) _lastId,
+                _lastCommittedBlockTimeStamp, _lastCommittedBlockTimeStampMs, _patchTimestamps,
+                DEFAULT_STORAGE_LIMIT_BYTES );
+        } else {
+            _engine = new ConsensusEngine( _lastId, DEFAULT_STORAGE_LIMIT_BYTES );
+            if ( !_patchTimestamps.empty() ) {
+                _engine->setTestPatchTimestamps( _patchTimestamps );
+            }
+        }
+
+        auto useBlockIdFromConsensus = _useBlockIDFromConsensus || ( _extFace == nullptr && _lastId == -1 );
+        _engine->parseTestConfigsAndCreateAllNodes(
+            Consensust::getConfigDirPath(), useBlockIdFromConsensus );
+        _engine->slowStartBootStrapTest();
+    }
+
     static block_id startEngineAndWait(
         ConsensusEngine*& _engine,
         int64_t _lastId,
@@ -73,12 +106,7 @@ class E2ETestHelper {
             { "bite2PatchTimestamp", 0 }
 #endif 
         } ) {
-        _engine = new ConsensusEngine( _lastId, 1000000000 );
-        if ( !_patchTimestamps.empty() ) {
-            _engine->setTestPatchTimestamps( _patchTimestamps );
-        }
-        _engine->parseTestConfigsAndCreateAllNodes( Consensust::getConfigDirPath(), _lastId == -1 );
-        _engine->slowStartBootStrapTest();
+        startEngine( _engine, _lastId, _patchTimestamps );
 
         usleep( 1000 * 1000 * _runTimeS );