From 8007a39c354df390852bc1922574bad5057de9b9 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Thu, 30 Jan 2020 08:16:41 +0100
Subject: [PATCH] src/ec.h: move typedefs and struct to types.h

---
 src/ec.h    |  9 ---------
 src/types.h | 11 +++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/ec.h b/src/ec.h
index a660ee8..29269e8 100644
--- a/src/ec.h
+++ b/src/ec.h
@@ -24,17 +24,8 @@
 #ifndef EC_H
 #define EC_H
 
-#include <array>
 #include "types.h"
 
-typedef std::array<unsigned char, EC_PRIVKEY_SIZE> ec_privkey_t;
-typedef std::array<unsigned char, EC_PUBKEY_SIZE> ec_pubkey_t;
-
-struct ec_keypair {
-	ec_privkey_t secret;
-	ec_pubkey_t pub;
-};
-
 /**
  * Generates a keypair using the secp256k1 curve.
  * public key is in compressed format.
diff --git a/src/types.h b/src/types.h
index 806b61f..1977f5d 100644
--- a/src/types.h
+++ b/src/types.h
@@ -24,6 +24,8 @@
 #ifndef TYPES_H
 #define TYPES_H
 
+#include <array>
+
 #define EC_PRIVKEY_SIZE 32
 
 /*
@@ -33,4 +35,13 @@
  */
 #define EC_PUBKEY_SIZE (32 + 1)
 
+
+typedef std::array<unsigned char, EC_PRIVKEY_SIZE> ec_privkey_t;
+typedef std::array<unsigned char, EC_PUBKEY_SIZE> ec_pubkey_t;
+
+struct ec_keypair {
+	ec_privkey_t secret;
+	ec_pubkey_t pub;
+};
+
 #endif /* TYPES_H */