evm: Rename finalize_block (#1928)

* Rename finalize_block * Revert "Rename finalize_block" This reverts commit efdfbc3. * Rename FFI call
DeFiCh · Apr 21, 2023 · 57b0565 · 57b0565
1 parent 12b7941
commit 57b0565
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/ain-rs-exports/src/lib.rs b/lib/ain-rs-exports/src/lib.rs
@@ -20,7 +20,7 @@ mod ffi {
         fn evm_get_context() -> u64;
         fn evm_discard_context(context: u64);
         fn evm_queue_tx(context: u64, raw_tx: &str) -> Result<bool>;
-        fn evm_finalise(
+        fn evm_finalize(
             context: u64,
             update_state: bool,
             miner_address: [u8; 20],
@@ -104,7 +104,7 @@ fn evm_queue_tx(context: u64, raw_tx: &str) -> Result<bool, Box<dyn Error>> {
 }
 
 use rlp::Encodable;
-fn evm_finalise(
+fn evm_finalize(
     context: u64,
     update_state: bool,
     miner_address: [u8; 20],

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -245,7 +245,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
 
     // TODO Get failed TXs and try to restore to mempool
     std::array<uint8_t, 20> dummyAddress{};
-    const auto rustHeader = evm_finalise(evmContext, false, dummyAddress);
+    const auto rustHeader = evm_finalize(evmContext, false, dummyAddress);
 
     std::vector<uint8_t> evmHeader{};
     evmHeader.resize(rustHeader.size());

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2873,7 +2873,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
             std::copy(minter.begin(), minter.end(), minerAddress.begin());
         }
 
-        evm_finalise(evmContext, true, minerAddress);
+        evm_finalize(evmContext, true, minerAddress);
     }
 
     auto &checkpoints = chainparams.Checkpoints().mapCheckpoints;