SKALED-1545 Formatting

skalenetwork · Nov 22, 2024 · 578f06a · 578f06a
1 parent ac34631
commit 578f06a
Show file tree

Hide file tree

Showing 82 changed files with 2,347 additions and 2,237 deletions.
diff --git a/libethereum/Block.cpp b/libethereum/Block.cpp
diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp
@@ -1073,10 +1073,10 @@ h256 Client::importTransaction( Transaction const& _t, TransactionBroadcast _txO
     gasBidPrice = this->gasBidPrice();
 
 
-        // We need to check external gas under mutex to be sure about current block number
-        // correctness
-        const_cast< Transaction& >( _t ).checkOutExternalGas(
-            chainParams(), bc().info().timestamp(), number() );
+    // We need to check external gas under mutex to be sure about current block number
+    // correctness
+    const_cast< Transaction& >( _t ).checkOutExternalGas(
+        chainParams(), bc().info().timestamp(), number() );
 
 
     Executive::verifyTransaction( _t, bc().info().timestamp(),

diff --git a/libethereum/SkaleHost.cpp b/libethereum/SkaleHost.cpp
@@ -580,7 +580,7 @@ void SkaleHost::createBlock( const ConsensusExtFace::transactions_vector& _appro
             Transaction t( data, CheckTransaction::Everything, true,
                 EIP1559TransactionsPatch::isEnabledInWorkingBlock() );
             t.checkOutExternalGas(
-                m_client.chainParams(), latestInfo.timestamp(), m_client.number());
+                m_client.chainParams(), latestInfo.timestamp(), m_client.number() );
             out_txns.push_back( t );
             m_debugTracer.tracepoint( "drop_good" );
             m_tq.dropGood( t );

diff --git a/libethereum/TransactionQueue.h b/libethereum/TransactionQueue.h
@@ -273,8 +273,8 @@ class TransactionQueue {
                 queue.m_currentByAddressAndNonce[_second.transaction.sender()].begin()->first;
 
             return ( height1 < height2 ||
-                           ( height1 == height2 &&
-                               _first.transaction.gasPrice() > _second.transaction.gasPrice() ) );
+                     ( height1 == height2 &&
+                         _first.transaction.gasPrice() > _second.transaction.gasPrice() ) );
         }
     };
 

diff --git a/libskale/State.cpp b/libskale/State.cpp
@@ -541,7 +541,7 @@ void State::commit( dev::eth::CommitBehaviour _commitBehaviour ) {
     // for testeth GeneralState tests, though, there is no db connected to the
     // State , so we do not clear caches
     // since they play the role of the db
-    if (m_db_ptr->connected()) {
+    if ( m_db_ptr->connected() ) {
         m_cache.clear();
         m_unchangedCacheEntries.clear();
     }

diff --git a/libskale/httpserveroverride.h b/libskale/httpserveroverride.h
@@ -41,10 +41,6 @@ typedef intptr_t ssize_t;
 #endif
 
 #include <stdexcept>
-#define RAPIDJSON_ASSERT( x )                                       \
-    if ( !( x ) ) {                                                 \
-        throw std::out_of_range( #x " failed with provided JSON" ); \
-    }
 #define RAPIDJSON_ASSERT_THROWS
 #include <rapidjson/document.h>
 #include <rapidjson/prettywriter.h>

diff --git a/libweb3jsonrpc/JsonHelper.h b/libweb3jsonrpc/JsonHelper.h
@@ -30,10 +30,6 @@
 #include <libethereum/LogFilter.h>
 
 #include <stdexcept>
-#define RAPIDJSON_ASSERT( x )                                       \
-    if ( !( x ) ) {                                                 \
-        throw std::out_of_range( #x " failed with provided JSON" ); \
-    }
 #define RAPIDJSON_ASSERT_THROWS
 
 #include <rapidjson/document.h>

diff --git a/skale-vm/main.cpp b/skale-vm/main.cpp
@@ -352,7 +352,6 @@ int main( int argc, char** argv ) {
     bytes output = std::move( res.output );
 
     if ( mode == Mode::Statistics ) {
-
         cout << "Gas used: " << res.gasUsed << " (+" << t.baseGasRequired( evmSchedule )
              << " for transaction, -" << res.gasRefunded << " refunded)\n";
 

diff --git a/storage_benchmark/main.cpp b/storage_benchmark/main.cpp
@@ -128,7 +128,7 @@ void testState() {
 
     cout << "Balances reads:" << endl;
     cout << measure_performance(
-                [&state, &address]() { state.createStateCopyAndClearCaches().balance(address ); },
+                [&state, &address]() { state.createStateCopyAndClearCaches().balance( address ); },
                 100000 ) /
                 1e6
          << " Mreads per second" << endl;
@@ -150,7 +150,7 @@ void testState() {
     cout << "EVM storate reads:" << endl;
     cout << measure_performance(
                 [&state, &address, &memory_address]() {
-                    state.createReadOnlySnapBasedCopy().storage(address, memory_address );
+                    state.createReadOnlySnapBasedCopy().storage( address, memory_address );
                     memory_address = ( memory_address + 1 ) % 1024;
                 },
                 1000 ) /
@@ -176,8 +176,9 @@ void testState() {
 
     cout << "EVM code reads:" << endl;
     cout << measure_performance(
-            [&state, &address]() { state.createReadOnlySnapBasedCopy().code(address ); }, 1000 ) /
-            1e6
+                [&state, &address]() { state.createReadOnlySnapBasedCopy().code( address ); },
+                1000 ) /
+                1e6
          << " Mreads per second" << endl;
 }
 

diff --git a/test/tools/fuzzTesting/BoostRandomCode.cpp b/test/tools/fuzzTesting/BoostRandomCode.cpp
@@ -55,13 +55,14 @@ BoostRandomCode::BoostRandomCode() {
 
 u256 BoostRandomCode::randomUniInt( u256 const& _minVal, u256 const& _maxVal ) {
     assert( _minVal <= _maxVal );
-    std::uniform_int_distribution< uint64_t > uint64Dist{0, std::numeric_limits< uint64_t >::max()};
+    std::uniform_int_distribution< uint64_t > uint64Dist{ 0,
+        std::numeric_limits< uint64_t >::max() };
     u256 value = _minVal + ( u256 ) uint64Dist( gen ) % ( _maxVal - _minVal );
     return value;
 }
 
 uint8_t BoostRandomCode::weightedOpcode( std::vector< int > const& _weights ) {
-    DescreteDistrib opCodeProbability = DescreteDistrib{_weights.begin(), _weights.end()};
+    DescreteDistrib opCodeProbability = DescreteDistrib{ _weights.begin(), _weights.end() };
     return opCodeProbability( gen );
 }
 }  // namespace test

diff --git a/test/tools/fuzzTesting/fuzzHelper.cpp b/test/tools/fuzzTesting/fuzzHelper.cpp
@@ -31,7 +31,7 @@
 
 using namespace dev;
 using namespace std;
-const static std::array< eth::Instruction, 47 > invalidOpcodes{{eth::Instruction::INVALID,
+const static std::array< eth::Instruction, 47 > invalidOpcodes{ { eth::Instruction::INVALID,
     eth::Instruction::PUSHC, eth::Instruction::JUMPC, eth::Instruction::JUMPCI,
     eth::Instruction::JUMPTO, eth::Instruction::JUMPIF, eth::Instruction::JUMPSUB,
     eth::Instruction::JUMPV, eth::Instruction::JUMPSUBV, eth::Instruction::BEGINSUB,
@@ -45,7 +45,7 @@ const static std::array< eth::Instruction, 47 > invalidOpcodes{{eth::Instruction
     eth::Instruction::XROR, eth::Instruction::XPUSH, eth::Instruction::XMLOAD,
     eth::Instruction::XMSTORE, eth::Instruction::XSLOAD, eth::Instruction::XSSTORE,
     eth::Instruction::XVTOWIDE, eth::Instruction::XWIDETOV, eth::Instruction::XPUT,
-    eth::Instruction::XGET, eth::Instruction::XSWIZZLE, eth::Instruction::XSHUFFLE}};
+    eth::Instruction::XGET, eth::Instruction::XSWIZZLE, eth::Instruction::XSHUFFLE } };
 
 namespace dev {
 namespace test {
@@ -227,7 +227,7 @@ std::string RandomCodeBase::generate( int _maxOpNumber, RandomCodeOptions const&
             opcode = makeOpcodeDefined( opcode );
             eth::Instruction inst = ( eth::Instruction ) opcode;
             eth::InstructionInfo info = eth::instructionInfo( inst );
-            if ( std::string{info.name}.find( "PUSH" ) != std::string::npos ) {
+            if ( std::string{ info.name }.find( "PUSH" ) != std::string::npos ) {
                 code += toCompactHex( opcode );
                 code += fillArguments( inst, _options );
             } else {