From 9c8e4ac76bbe4eb4d7353f16f8c298ad40305da9 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Fri, 12 Oct 2018 19:39:17 +0200
Subject: [PATCH] Move bls stuff from crypto/ to bls/

---
 src/Makefile.am                    | 12 ++++++------
 src/bench/bench_dash.cpp           |  2 +-
 src/bench/bls.cpp                  |  2 +-
 src/bench/bls_dkg.cpp              |  2 +-
 src/{crypto => bls}/bls.cpp        |  0
 src/{crypto => bls}/bls.h          |  0
 src/{crypto => bls}/bls_ies.cpp    |  2 +-
 src/{crypto => bls}/bls_ies.h      |  0
 src/{crypto => bls}/bls_worker.cpp |  0
 src/{crypto => bls}/bls_worker.h   |  0
 src/init.cpp                       |  2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename src/{crypto => bls}/bls.cpp (100%)
 rename src/{crypto => bls}/bls.h (100%)
 rename src/{crypto => bls}/bls_ies.cpp (99%)
 rename src/{crypto => bls}/bls_ies.h (100%)
 rename src/{crypto => bls}/bls_worker.cpp (100%)
 rename src/{crypto => bls}/bls_worker.h (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index f441a77e97..8cbd73d0f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -314,8 +314,6 @@ crypto_libdash_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS)
 crypto_libdash_crypto_a_SOURCES = \
   crypto/aes.cpp \
   crypto/aes.h \
-  crypto/bls.cpp \
-  crypto/bls.h \
   crypto/common.h \
   crypto/hmac_sha256.cpp \
   crypto/hmac_sha256.h \
@@ -364,6 +362,8 @@ libdash_consensus_a_SOURCES = \
   amount.h \
   arith_uint256.cpp \
   arith_uint256.h \
+  bls/bls.cpp \
+  bls/bls.h \
   consensus/merkle.cpp \
   consensus/merkle.h \
   consensus/params.h \
@@ -422,10 +422,10 @@ libdash_common_a_SOURCES = \
 libdash_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libdash_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libdash_util_a_SOURCES = \
-  crypto/bls_ies.cpp \
-  crypto/bls_ies.h \
-  crypto/bls_worker.cpp \
-  crypto/bls_worker.h \
+  bls/bls_ies.cpp \
+  bls/bls_ies.h \
+  bls/bls_worker.cpp \
+  bls/bls_worker.h \
   support/lockedpool.cpp \
   chainparamsbase.cpp \
   clientversion.cpp \
diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
index 533ae7194c..a1d2085024 100644
--- a/src/bench/bench_dash.cpp
+++ b/src/bench/bench_dash.cpp
@@ -8,7 +8,7 @@
 #include "validation.h"
 #include "util.h"
 
-#include "crypto/bls.h"
+#include "bls/bls.h"
 
 void CleanupBLSTests();
 void CleanupBLSDkgTests();
diff --git a/src/bench/bls.cpp b/src/bench/bls.cpp
index 04c0665b8c..f3bf97fc36 100644
--- a/src/bench/bls.cpp
+++ b/src/bench/bls.cpp
@@ -4,7 +4,7 @@
 
 #include "bench.h"
 #include "random.h"
-#include "crypto/bls_worker.h"
+#include "bls/bls_worker.h"
 #include "utiltime.h"
 
 #include <iostream>
diff --git a/src/bench/bls_dkg.cpp b/src/bench/bls_dkg.cpp
index d2ffd8f579..e6e473e2c7 100644
--- a/src/bench/bls_dkg.cpp
+++ b/src/bench/bls_dkg.cpp
@@ -4,7 +4,7 @@
 
 #include "bench.h"
 #include "random.h"
-#include "crypto/bls_worker.h"
+#include "bls/bls_worker.h"
 
 extern CBLSWorker blsWorker;
 
diff --git a/src/crypto/bls.cpp b/src/bls/bls.cpp
similarity index 100%
rename from src/crypto/bls.cpp
rename to src/bls/bls.cpp
diff --git a/src/crypto/bls.h b/src/bls/bls.h
similarity index 100%
rename from src/crypto/bls.h
rename to src/bls/bls.h
diff --git a/src/crypto/bls_ies.cpp b/src/bls/bls_ies.cpp
similarity index 99%
rename from src/crypto/bls_ies.cpp
rename to src/bls/bls_ies.cpp
index 7212692ec4..2c67b97378 100644
--- a/src/crypto/bls_ies.cpp
+++ b/src/bls/bls_ies.cpp
@@ -8,7 +8,7 @@
 #include "random.h"
 #include "streams.h"
 
-#include "aes.h"
+#include "crypto/aes.h"
 
 template <typename Out>
 static bool EncryptBlob(const void* in, size_t inSize, Out& out, const void* symKey, const void* iv)
diff --git a/src/crypto/bls_ies.h b/src/bls/bls_ies.h
similarity index 100%
rename from src/crypto/bls_ies.h
rename to src/bls/bls_ies.h
diff --git a/src/crypto/bls_worker.cpp b/src/bls/bls_worker.cpp
similarity index 100%
rename from src/crypto/bls_worker.cpp
rename to src/bls/bls_worker.cpp
diff --git a/src/crypto/bls_worker.h b/src/bls/bls_worker.h
similarity index 100%
rename from src/crypto/bls_worker.h
rename to src/bls/bls_worker.h
diff --git a/src/init.cpp b/src/init.cpp
index 88e64ddaa1..2dd8e1926b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -72,7 +72,7 @@
 #include <stdio.h>
 #include <memory>
 
-#include "crypto/bls.h"
+#include "bls/bls.h"
 
 #ifndef WIN32
 #include <signal.h>