Merge remote-tracking branch 'upstream/develop' into stateTests

libdevcore/Exceptions.h

@@ -44,6 +44,6 @@ struct FileError: virtual Exception {};
 
 // error information to be added to exceptions
 typedef boost::error_info<struct tag_invalidSymbol, char> errinfo_invalidSymbol;
-typedef boost::error_info<struct tag_comment, std::string> errinfo_wrongAddress;
+typedef boost::error_info<struct tag_address, std::string> errinfo_wrongAddress;
 typedef boost::error_info<struct tag_comment, std::string> errinfo_comment;
 }

libethereum/Account.h

@@ -123,13 +123,12 @@ public:
 	h256 baseRoot() const { assert(m_storageRoot); return m_storageRoot; }
 
 	/// @returns the storage overlay as a simple map.
-	std::map<u256, u256> const& storageOverlay() const { return m_storageOverlay; }
+	std::map<u256, u256> const& storage() const { return m_storageOverlay; }
 
 	/// Set a key/value pair in the account's storage. This actually goes into the overlay, for committing
 	/// to the trie later.
 	void setStorage(u256 _p, u256 _v) { m_storageOverlay[_p] = _v; }
 
-
 	/// @returns true if we are in the contract-conception state and setCode is valid to call.
 	bool isFreshCode() const { return m_codeHash == c_contractConceptionCodeHash; }