fixes after review

epochStart/metachain/systemSCs_test.go

@@ -764,7 +764,7 @@ func createAccountsDB(
 		StoragePruningManager: spm,
 		AddressConverter:      &testscommon.PubkeyConverterMock{},
 		SnapshotsManager:      disabledState.NewDisabledSnapshotsManager(),
-		StateChangesCollector: state.NewStateChangesCollector(),
+		StateChangesCollector: disabledState.NewDisabledStateChangesCollector(),
 	}
 	adb, _ := state.NewAccountsDB(args)
 	return adb

factory/processing/blockProcessorCreator_test.go

@@ -208,7 +208,7 @@ func createAccountAdapter(
 		StoragePruningManager: disabled.NewDisabledStoragePruningManager(),
 		AddressConverter:      &testscommon.PubkeyConverterMock{},
 		SnapshotsManager:      disabledState.NewDisabledSnapshotsManager(),
-		StateChangesCollector: state.NewStateChangesCollector(),
+		StateChangesCollector: disabledState.NewDisabledStateChangesCollector(),
 	}
 	adb, err := state.NewAccountsDB(args)
 	if err != nil {

process/transaction/shardProcess.go

@@ -195,6 +195,7 @@ func (txProc *txProcessor) ProcessTransaction(tx *transaction.Transaction) (vmco
 		txProc.pubkeyConv,
 	)
 
+	// TODO refactor to set the tx hash for the following state changes before the processing occurs
 	defer txProc.accounts.SetTxHashForLatestStateChanges(txHash)
 
 	txType, dstShardTxType := txProc.txTypeHandler.ComputeTransactionType(tx)

state/accountsDB.go

@@ -280,15 +280,15 @@ func (adb *AccountsDB) SaveAccount(account vmcommon.AccountHandler) error {
 	}
 	adb.stateChangesCollector.AddStateChange(stateChange)
 
-	return err
+	return nil
 }
 
 func (adb *AccountsDB) saveCodeAndDataTrie(oldAcc, newAcc vmcommon.AccountHandler) ([]DataTrieChange, error) {
 	baseNewAcc, newAccOk := newAcc.(baseAccountHandler)
 	baseOldAccount, _ := oldAcc.(baseAccountHandler)
 
 	if !newAccOk {
-		return make([]DataTrieChange, 0), nil
+		return nil, nil
 	}
 
 	newValues, err := adb.saveDataTrie(baseNewAcc)
@@ -301,7 +301,7 @@ func (adb *AccountsDB) saveCodeAndDataTrie(oldAcc, newAcc vmcommon.AccountHandle
 		return nil, err
 	}
 
-	return newValues, err
+	return newValues, nil
 }
 
 func (adb *AccountsDB) saveCode(newAcc, oldAcc baseAccountHandler) error {
@@ -384,6 +384,7 @@ func (adb *AccountsDB) updateOldCodeEntry(oldCodeHash []byte) (*CodeEntry, error
 		return nil, err
 	}
 
+	// TODO refactor this after remove code leaf is merged
 	stateChange := StateChangeDTO{
 		MainTrieKey:     oldCodeHash,
 		MainTrieVal:     codeEntryBytes,

state/accountsDBApi.go

@@ -244,7 +244,7 @@ func (accountsDB *accountsDBApi) SetTxHashForLatestStateChanges(txHash []byte) {
 
 // ResetStateChangesCollector returns nil
 func (accountsDB *accountsDBApi) ResetStateChangesCollector() []StateChangesForTx {
-	return nil
+	return accountsDB.innerAccountsAdapter.ResetStateChangesCollector()
 }
 
 // Close will handle the closing of the underlying components