Merge branch 'develop' into cmake3.2.1

Conflicts:
	test/CMakeLists.txt

1 files changed, 0 insertions, 58 deletions

diff --git a/main.cpp b/main.cpp
deleted file mode 100644
index 6ec8885b..00000000
--- a/main.cpp
+++ /dev/null
@@ -1,58 +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 main.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- * Main test functions.
- */
-
-#include <libdevcrypto/TrieDB.h>
-#include "TrieHash.h"
-#include "MemTrie.h"
-
-#include <boost/test/unit_test.hpp>
-
-int trieTest();
-int rlpTest();
-int daggerTest();
-int cryptoTest();
-int stateTest();
-int vmTest();
-int hexPrefixTest();
-int peerTest(int argc, char** argv);
-
-#include <libdevcore/Log.h>
-#include <libethcore/BlockInfo.h>
-using namespace std;
-using namespace dev;
-using namespace dev::eth;
-
-//BOOST_AUTO_TEST_CASE(basic_tests)
-//{
-/*	RLPStream s;
-	BlockInfo::genesis().streamRLP(s, false);
-	std::cout << RLP(s.out()) << std::endl;
-	std::cout << toHex(s.out()) << std::endl;
-	std::cout << sha3(s.out()) << std::endl;*/
-
-//	int r = 0;
-//	r += daggerTest();
-//	r += stateTest();
-//	r += peerTest(argc, argv);
-//	BOOST_REQUIRE(!r);
-//}
-