From 22e390f92294465661d01c56769ebeb4a4e8a235 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Sat, 18 Jun 2016 15:00:12 +0200
Subject: [PATCH] Rename block_dao -> reject_dao.

---
 ethcore/src/ethereum/ethash.rs | 2 +-
 ethcore/src/evm/schedule.rs    | 4 ++--
 ethcore/src/state.rs           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index d89499872..a4291796a 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -103,7 +103,7 @@ impl Engine for Ethash {
 		} else {
 			let mut s = Schedule::new_homestead();
 			// TODO: make dependent on gaslimit > 4000000 of block 1760000.	
-			s.block_dao_transactions = env_info.number >= 1760000;
+			s.reject_dao_transactions = env_info.number >= 1760000;
 			s
 		}
 	}
diff --git a/ethcore/src/evm/schedule.rs b/ethcore/src/evm/schedule.rs
index 59f30e7d3..188e72373 100644
--- a/ethcore/src/evm/schedule.rs
+++ b/ethcore/src/evm/schedule.rs
@@ -81,7 +81,7 @@ pub struct Schedule {
 	/// Gas price for copying memory
 	pub copy_gas: usize,
 	/// DAO Rescue softfork block
-	pub block_dao_transactions: bool,
+	pub reject_dao_transactions: bool,
 }
 
 impl Schedule {
@@ -128,7 +128,7 @@ impl Schedule {
 			tx_data_zero_gas: 4,
 			tx_data_non_zero_gas: 68,
 			copy_gas: 3,	
-			block_dao_transactions: false,
+			reject_dao_transactions: false,
 		}
 	}
 }
diff --git a/ethcore/src/state.rs b/ethcore/src/state.rs
index dc9ca582c..7d045b455 100644
--- a/ethcore/src/state.rs
+++ b/ethcore/src/state.rs
@@ -225,7 +225,7 @@ impl State {
 		let broken_dao = H256::from("7278d050619a624f84f51987149ddb439cdaadfba5966f7cfaea7ad44340a4ba");
 
 		// dao attack soft fork
-		if engine.schedule(&env_info).block_dao_transactions {
+		if engine.schedule(&env_info).reject_dao_transactions {
 			// collect all the addresses which have changed.
 			let addresses = self.cache.borrow().iter().map(|(addr, _)| addr.clone()).collect::<Vec<_>>();