From 977525138457bd4b89137caee442c4cbb0101781 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Sun, 9 Sep 2018 20:27:24 +0700
Subject: [PATCH] [*] Fixed build errors, renames
---
CMakeLists.txt | 6 +++---
dap_chain_datum.c | 8 ++++----
dap_chain_datum.h | 24 ++++++++++++------------
dap_chain_datum_coin.c | 2 +-
dap_chain_datum_hashtree_roots.c | 4 ++--
dap_chain_datum_hashtree_roots.h | 12 ++++++------
dap_chain_datum_tx.c | 4 ++--
dap_chain_datum_tx.h | 8 ++++----
dap_chain_datum_tx_in.h | 2 +-
dap_chain_datum_tx_out.h | 2 +-
dap_chain_datum_tx_pkey.h | 2 +-
dap_chain_datum_tx_sig.h | 2 +-
dap_chain_ops.c | 19 -------------------
dap_chain_ops.h | 8 --------
14 files changed, 38 insertions(+), 65 deletions(-)
delete mode 100644 dap_chain_ops.c
delete mode 100644 dap_chain_ops.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c412cf6..e1ba7ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,11 +8,9 @@ set(DAP_CHAIN_SRCS
dap_chain_datum_tx.c
dap_chain_datum_coin.c
dap_chain.c
- dap_chain_ops.c
)
set(DAP_CHAIN_HEADERS
- dap_chain_ops.h
dap_chain.h
dap_chain_internal.h
dap_chain_common.h
@@ -28,7 +26,9 @@ set(DAP_CHAIN_HEADERS
add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_SRCS} ${DAP_CHAIN_HEADERS})
-target_link_libraries(dap_chain dap_core )
+target_link_libraries(dap_chain dap_core dap_chain_block )
+target_include_directories(dap_chain INTERFACE .)
+
set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
diff --git a/dap_chain_datum.c b/dap_chain_datum.c
index 015682c..eee06a6 100644
--- a/dap_chain_datum.c
+++ b/dap_chain_datum.c
@@ -23,9 +23,9 @@
*/
#include "dap_common.h"
-#include "dap_chain_section.h"
-#include "dap_chain_section_tx.h"
-#include "dap_chain_section_roots.h"
-#include "dap_chain_section_coin.h"
+#include "dap_chain_datum.h"
+#include "dap_chain_datum_tx.h"
+#include "dap_chain_datum_hashtree_roots.h"
+#include "dap_chain_datum_coin.h"
#define LOG_TAG "dap_chain_secion"
diff --git a/dap_chain_datum.h b/dap_chain_datum.h
index 2137d94..e32c882 100644
--- a/dap_chain_datum.h
+++ b/dap_chain_datum.h
@@ -28,42 +28,42 @@
#include "dap_chain_common.h"
/// End section, means all the rest of the block is empty
-#define DAP_CHAIN_SECTION_END 0x0000
+#define dap_chain_datum_END 0x0000
/// Section with additional roots, for example transaction roots
-#define DAP_CHAIN_SECTION_ROOTS 0x0001
+#define dap_chain_datum_hashtree_roots 0x0001
/// Transaction header section
-#define DAP_CHAIN_SECTION_TX 0x0100
+#define dap_chain_datum_TX 0x0100
/// Transaction request section
-#define DAP_CHAIN_SECTION_TX_REQUEST 0x0300
+#define dap_chain_datum_TX_REQUEST 0x0300
/// Smart contract: DVM code section
-#define DAP_CHAIN_SECTION_DVM_CODE 0x0900
+#define dap_chain_datum_DVM_CODE 0x0900
/// Smart contract: DVM code section
-#define DAP_CHAIN_SECTION_DVM_DATA 0x0901
+#define dap_chain_datum_DVM_DATA 0x0901
/// Smart contract: EVM code section
-#define DAP_CHAIN_SECTION_EVM_CODE 0x0910
+#define dap_chain_datum_EVM_CODE 0x0910
/// Smart contract: EVM data section
-#define DAP_CHAIN_SECTION_EVM_DATA 0x0911
+#define dap_chain_datum_EVM_DATA 0x0911
/// Pub key section, with sign and address
-#define DAP_CHAIN_SECTION_PKEY 0x0c00
+#define dap_chain_datum_PKEY 0x0c00
/// Coin
-#define DAP_CHAIN_SECTION_COIN 0xf000
+#define dap_chain_datum_COIN 0xf000
/**
* @struct dap_chain_block_section
* @brief section inside the block
*/
-typedef struct dap_chain_section{
+typedef struct dap_chain_datum{
uint16_t type; // Section type
uint8_t data[]; // data
-} DAP_ALIGN_PACKED dap_chain_section_t;
+} DAP_ALIGN_PACKED dap_chain_datum_t;
diff --git a/dap_chain_datum_coin.c b/dap_chain_datum_coin.c
index 3ceff1d..9345691 100644
--- a/dap_chain_datum_coin.c
+++ b/dap_chain_datum_coin.c
@@ -21,4 +21,4 @@
You should have received a copy of the GNU General Public License
along with any DAP based project. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "dap_chain_coin.h"
+#include "dap_chain_datum_coin.h"
diff --git a/dap_chain_datum_hashtree_roots.c b/dap_chain_datum_hashtree_roots.c
index fa093bf..e31522d 100644
--- a/dap_chain_datum_hashtree_roots.c
+++ b/dap_chain_datum_hashtree_roots.c
@@ -24,6 +24,6 @@
#include "dap_common.h"
-#include "dap_chain_section_roots.h"
+#include "dap_chain_datum_hashtree_roots.h"
-#define LOG_TAG "dap_chain_section_roots"
+#define LOG_TAG "dap_chain_datum_hashtree_roots"
diff --git a/dap_chain_datum_hashtree_roots.h b/dap_chain_datum_hashtree_roots.h
index 491a069..ad13c8d 100644
--- a/dap_chain_datum_hashtree_roots.h
+++ b/dap_chain_datum_hashtree_roots.h
@@ -27,21 +27,21 @@
#include "dap_chain_common.h"
/**
- * @struct dap_chain_section_roots_v1
+ * @struct dap_chain_datum_hashtree_roots_v1
* @brief Hash tree roots for block, version 1
*/
-typedef struct dap_chain_section_roots_v1{
+typedef struct dap_chain_datum_hashtree_roots_v1{
dap_chain_hash_t main;
} DAP_ALIGN_PACKED dap_chain_block_roots_v1_t;
/**
- * @struct dap_chain_section_roots_v2
+ * @struct dap_chain_datum_hashtree_roots_v2
* @brief Hash tree roots for block, version 2
*/
-typedef struct dap_chain_section_roots_v2{
+typedef struct dap_chain_datum_hashtree_roots_v2{
dap_chain_hash_t main;
dap_chain_hash_t txs;
-} DAP_ALIGN_PACKED dap_chain_section_roots_v2_t;
+} DAP_ALIGN_PACKED dap_chain_datum_hashtree_roots_v2_t;
-typedef dap_chain_section_roots_v2_t dap_chain_section_roots_t;
+typedef dap_chain_datum_hashtree_roots_v2_t dap_chain_datum_hashtree_roots_t;
diff --git a/dap_chain_datum_tx.c b/dap_chain_datum_tx.c
index 39e0e02..30ce5d8 100644
--- a/dap_chain_datum_tx.c
+++ b/dap_chain_datum_tx.c
@@ -23,6 +23,6 @@
*/
#include "dap_common.h"
-#include "dap_chain_section_tx.h"
+#include "dap_chain_datum_tx.h"
-#define LOG_TAG "dap_chain_section_tx"
+#define LOG_TAG "dap_chain_datum_tx"
diff --git a/dap_chain_datum_tx.h b/dap_chain_datum_tx.h
index 3e4c27c..081defd 100644
--- a/dap_chain_datum_tx.h
+++ b/dap_chain_datum_tx.h
@@ -23,7 +23,7 @@
*/
#pragma once
#include "dap_chain_common.h"
-#include "dap_chain_section.h"
+#include "dap_chain_datum.h"
typedef enum dap_chain_tx_item_type{
TX_ITEM_TYPE_IN = 0x00, /// @brief Transaction inputs
@@ -33,14 +33,14 @@ typedef enum dap_chain_tx_item_type{
} dap_chain_tx_item_type_t;
/**
- * @struct dap_chain_section_tx
+ * @struct dap_chain_datum_tx
* @brief Transaction section, consists from lot of tx_items
*/
-typedef struct dap_chain_section_tx{
+typedef struct dap_chain_datum_tx{
struct {
uint64_t lock_time;
uint32_t tx_items_size; // size of next sequencly lying tx_item sections would be decided to belong this transaction
} DAP_ALIGN_PACKED header;
uint8_t tx_items[];
-} DAP_ALIGN_PACKED dap_chain_section_tx_t;
+} DAP_ALIGN_PACKED dap_chain_datum_tx_t;
diff --git a/dap_chain_datum_tx_in.h b/dap_chain_datum_tx_in.h
index 18f0ee9..dc41c77 100644
--- a/dap_chain_datum_tx_in.h
+++ b/dap_chain_datum_tx_in.h
@@ -26,7 +26,7 @@
#include <stdint.h>
#include "dap_common.h"
#include "dap_chain_common.h"
-#include "dap_chain_section_tx.h"
+#include "dap_chain_datum_tx.h"
/**
* @struct dap_chain_tx_item
* @brief Sections belongs to heading tx section, with inputs, outputs and others tx relatated items
diff --git a/dap_chain_datum_tx_out.h b/dap_chain_datum_tx_out.h
index c46b767..24f8240 100644
--- a/dap_chain_datum_tx_out.h
+++ b/dap_chain_datum_tx_out.h
@@ -26,7 +26,7 @@
#include <stdint.h>
#include "dap_common.h"
#include "dap_chain_common.h"
-#include "dap_chain_section_tx.h"
+#include "dap_chain_datum_tx.h"
/**
* @struct dap_chain_tx_out
diff --git a/dap_chain_datum_tx_pkey.h b/dap_chain_datum_tx_pkey.h
index abf7ab6..ad64cc6 100644
--- a/dap_chain_datum_tx_pkey.h
+++ b/dap_chain_datum_tx_pkey.h
@@ -26,7 +26,7 @@
#include <stdint.h>
#include "dap_common.h"
#include "dap_chain_common.h"
-#include "dap_chain_section_tx.h"
+#include "dap_chain_datum_tx.h"
/**
* @struct dap_chain_tx_pkey
* @brief TX item with one of the transaction's public keys
diff --git a/dap_chain_datum_tx_sig.h b/dap_chain_datum_tx_sig.h
index cfeb850..bb5aefd 100644
--- a/dap_chain_datum_tx_sig.h
+++ b/dap_chain_datum_tx_sig.h
@@ -26,7 +26,7 @@
#include <stdint.h>
#include "dap_common.h"
#include "dap_chain_common.h"
-#include "dap_chain_section_tx.h"
+#include "dap_chain_datum_tx.h"
/**
diff --git a/dap_chain_ops.c b/dap_chain_ops.c
deleted file mode 100644
index c31aba5..0000000
--- a/dap_chain_ops.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "dap_chain_common.h"
-#include "dap_chain_ops.h"
-#include "dap_chain_block_txs.h"
-
-/**
- * @brief dap_chain_op_tx_request
- * @param a_wallet Sender's wallet
- * @param a_wallet_key_idx Key index in the wallet
- * @param a_chain_source Blockchain which token we send from
- * @param a_value Amount of daptoshi's that we wish to send
- * @param a_chain_tx_request Blockhain where we want to record our transaction request
- * @param a_destination Destination address
- */
-void dap_chain_op_tx_request(dap_chain_wallet_t * a_wallet, uint32_t a_wallet_key_idx,
- dap_chain_t * a_chain_source, uint64_t a_value, /// Token source and daptoshi's value
- dap_chain_t * a_chain_tx_request, dap_chain_addr_t a_destination ) /// TX blockchain where to create new block
-{
-
-}
diff --git a/dap_chain_ops.h b/dap_chain_ops.h
deleted file mode 100644
index d6e984f..0000000
--- a/dap_chain_ops.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "dap_chain.h"
-#include "dap_chain_wallet.h"
-
-void dap_chain_op_tx_request(dap_chain_wallet_t * a_wallet, uint32_t a_wallet_key_idx, /// Sender's wallet and key index in it
- dap_chain_t * a_chain_source, uint64_t a_value, /// Token source and daptoshi's value
- dap_chain_t * a_chain_tx_request, dap_chain_addr_t a_destination ); /// TX blockchain where to create new block
--
GitLab