Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions

1 files changed, 0 insertions, 105 deletions

diff --git a/stateOriginal.cpp b/stateOriginal.cpp
deleted file mode 100644
index 7f337148..00000000
--- a/stateOriginal.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-	This file is part of cpp-ethereum.
-
-	cpp-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	cpp-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file stateOriginal.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- * State test functions.
- */
-
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem/operations.hpp>
-#include <secp256k1/secp256k1.h>
-#include <libethereum/CanonBlockChain.h>
-#include <libethereum/State.h>
-#include <libethereum/Farm.h>
-#include <libethereum/Defaults.h>
-#include "TestHelper.h"
-using namespace std;
-using namespace dev;
-using namespace dev::eth;
-
-namespace dev
-{
-namespace test
-{
-
-int stateTest();
-
-BOOST_AUTO_TEST_SUITE(StateIntegration)
-
-BOOST_AUTO_TEST_CASE(Basic)
-{
-	State s;
-}
-
-BOOST_AUTO_TEST_CASE(Complex)
-{
-	cnote << "Testing State...";
-
-	KeyPair me = sha3("Gav Wood");
-	KeyPair myMiner = sha3("Gav's Miner");
-//	KeyPair you = sha3("123");
-
-	Defaults::setDBPath(boost::filesystem::temp_directory_path().string() + "/" + toString(chrono::system_clock::now().time_since_epoch().count()));
-
-	OverlayDB stateDB = State::openDB();
-	CanonBlockChain bc;
-	cout << bc;
-
-	State s(stateDB, BaseState::CanonGenesis, myMiner.address());
-	cout << s;
-
-	// Sync up - this won't do much until we use the last state.
-	s.sync(bc);
-
-	cout << s;
-
-	// Mine to get some ether!
-	mine(s, bc);
-
-	bc.attemptImport(s.blockData(), stateDB);
-
-	cout << bc;
-
-	s.sync(bc);
-
-	cout << s;
-
-	// Inject a transaction to transfer funds from miner to me.
-	Transaction t(1000, 10000, 100000, me.address(), bytes(), s.transactionsFrom(myMiner.address()), myMiner.secret());
-	assert(t.sender() == myMiner.address());
-	s.execute(bc.lastHashes(), t);
-
-	cout << s;
-
-	// Mine to get some ether and set in stone.
-	s.commitToMine(bc);
-	s.commitToMine(bc);
-	mine(s, bc);
-	bc.attemptImport(s.blockData(), stateDB);
-
-	cout << bc;
-
-	s.sync(bc);
-
-	cout << s;
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}
-}