grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1685 from ethcore/substate_cleanup

Browse Source 
small cleanup of substate.rs
This commit is contained in:
Marek Kotewicz 2016-07-21 19:23:28 +02:00 committed by GitHub
commit ce00c13c7a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ethcore/src/externalities.rs
View File

@ -262,6 +262,7 @@ impl<'a, T, V> Ext for Externalities<'a, T, V> where T: 'a + Tracer, V: 'a + VMT
trace!("Suiciding {} -> {} (xfer: {})", address, refund_address, balance); trace!("Suiciding {} -> {} (xfer: {})", address, refund_address, balance);
self.state.transfer_balance(&address, refund_address, &balance); self.state.transfer_balance(&address, refund_address, &balance);
} }
self.substate.suicides.insert(address); self.substate.suicides.insert(address);
} }

25
ethcore/src/substate.rs
View File

@ -15,7 +15,9 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
//! Execution environment substate. //! Execution environment substate.
use common::*; use std::collections::HashSet;
use util::{Address, U256};
use log_entry::LogEntry;
/// State changes which should be applied in finalize, /// State changes which should be applied in finalize,
/// after transaction is fully executed. /// after transaction is fully executed.
@ -37,12 +39,7 @@ pub struct Substate {
impl Substate { impl Substate {
/// Creates new substate. /// Creates new substate.
pub fn new() -> Self { pub fn new() -> Self {
Substate { Substate::default()
suicides: Default::default(),
logs: Default::default(),
sstore_clears_count: Default::default(),
contracts_created: Default::default(),
}
} }
/// Merge secondary substate `s` into self, accruing each element correspondingly. /// Merge secondary substate `s` into self, accruing each element correspondingly.
@ -56,8 +53,8 @@ impl Substate {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::Substate;
use common::*; use log_entry::LogEntry;
#[test] #[test]
fn created() { fn created() {
@ -68,19 +65,19 @@ mod tests {
#[test] #[test]
fn accrue() { fn accrue() {
let mut sub_state = Substate::new(); let mut sub_state = Substate::new();
sub_state.contracts_created.push(address_from_u64(1u64)); sub_state.contracts_created.push(1u64.into());
sub_state.logs.push(LogEntry { sub_state.logs.push(LogEntry {
address: address_from_u64(1u64), address: 1u64.into(),
topics: vec![], topics: vec![],
data: vec![] data: vec![]
}); });
sub_state.sstore_clears_count = 5.into(); sub_state.sstore_clears_count = 5.into();
sub_state.suicides.insert(address_from_u64(10u64)); sub_state.suicides.insert(10u64.into());
let mut sub_state_2 = Substate::new(); let mut sub_state_2 = Substate::new();
sub_state_2.contracts_created.push(address_from_u64(2u64)); sub_state_2.contracts_created.push(2u64.into());
sub_state_2.logs.push(LogEntry { sub_state_2.logs.push(LogEntry {
address: address_from_u64(1u64), address: 1u64.into(),
topics: vec![], topics: vec![],
data: vec![] data: vec![]
}); });