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

Conflicts:
	evmjit/CMakeLists.txt
	evmjit/libevmjit/Arith256.cpp

1 files changed, 11 insertions, 0 deletions

diff --git a/TestUtils.cpp b/TestUtils.cpp
index ff5169d5..bd603a61 100644
--- a/TestUtils.cpp
+++ b/TestUtils.cpp
@@ -22,6 +22,7 @@
 #include <thread>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
+#include <libdevcrypto/Common.h>
 #include <libtestutils/Common.h>
 #include <libtestutils/BlockChainLoader.h>
 #include <libtestutils/FixedClient.h>
@@ -116,3 +117,13 @@ void ParallelClientBaseFixture::enumerateClients(std::function<void(Json::Value
 		});
 	});
 }
+
+MoveNonceToTempDir::MoveNonceToTempDir()
+{
+	crypto::Nonce::setSeedFilePath(m_dir.path() + "/seed");
+}
+
+MoveNonceToTempDir::~MoveNonceToTempDir()
+{
+	crypto::Nonce::reset();
+}