node: Move bytecode_charge function to core

node/src/mempool.rs

@@ -212,7 +212,7 @@ impl MempoolSrv {
             return Err(TxAcceptanceError::GasPriceTooLow(1));
         }
 
-        if let Some(deploy) = tx.inner.deploy() {
+        if tx.inner.deploy().is_some() {
             let vm = vm.read().await;
             let min_deployment_gas_price = vm.min_deployment_gas_price();
             if tx.gas_price() < min_deployment_gas_price {
@@ -222,13 +222,11 @@ impl MempoolSrv {
             }
 
             let gas_per_deploy_byte = vm.gas_per_deploy_byte();
-            let min_gas_limit = vm::bytecode_charge(
-                &deploy.bytecode,
-                gas_per_deploy_byte,
-                vm.min_deploy_points(),
-            );
-            if tx.inner.gas_limit() < min_gas_limit {
-                return Err(TxAcceptanceError::GasLimitTooLow(min_gas_limit));
+            let deploy_charge = tx
+                .inner
+                .deploy_charge(gas_per_deploy_byte, vm.min_deploy_points());
+            if tx.inner.gas_limit() < deploy_charge {
+                return Err(TxAcceptanceError::GasLimitTooLow(deploy_charge));
             }
         } else {
             let vm = vm.read().await;

node/src/vm.rs

@@ -9,11 +9,9 @@ use dusk_consensus::operations::{CallParams, VerificationOutput, Voter};
 use dusk_consensus::user::provisioners::Provisioners;
 use dusk_consensus::user::stake::Stake;
 use dusk_core::signatures::bls::PublicKey as BlsPublicKey;
-use dusk_core::transfer::data::ContractBytecode;
 use dusk_core::transfer::moonlight::AccountData;
 use node_data::events::contract::ContractEvent;
 use node_data::ledger::{Block, SpentTransaction, Transaction};
-use std::cmp::max;
 
 #[derive(Default)]
 pub struct Config {}
@@ -102,15 +100,3 @@ pub enum PreverificationResult {
         nonce_used: u64,
     },
 }
-
-// Returns gas charge for bytecode deployment.
-pub fn bytecode_charge(
-    bytecode: &ContractBytecode,
-    gas_per_deploy_byte: u64,
-    min_deploy_points: u64,
-) -> u64 {
-    max(
-        bytecode.bytes.len() as u64 * gas_per_deploy_byte,
-        min_deploy_points,
-    )
-}