From 7017d31c3ecaf1936daf93c86b0e386ff1fbdde3 Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Sat, 17 Feb 2024 00:13:37 +0300
Subject: [PATCH] [*] DAP HTTP server renaming
---
dap-sdk | 2 +-
modules/mempool/dap_chain_mempool.c | 2 +-
modules/mempool/include/dap_chain_mempool.h | 4 +--
modules/net/dap_chain_net_news.h | 28 -------------------
modules/net/dap_chain_node_cli_cmd.c | 4 ---
modules/net/include/dap_chain_net_bugreport.h | 4 +--
6 files changed, 6 insertions(+), 38 deletions(-)
delete mode 100644 modules/net/dap_chain_net_news.h
diff --git a/dap-sdk b/dap-sdk
index ffe94f1c89..151d0e0b48 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit ffe94f1c89eee6e0be9572afc706055f1122363d
+Subproject commit 151d0e0b486d9384fc707a1bb42d5d8e66329928
diff --git a/modules/mempool/dap_chain_mempool.c b/modules/mempool/dap_chain_mempool.c
index 7dbf04b512..44fe70e588 100644
--- a/modules/mempool/dap_chain_mempool.c
+++ b/modules/mempool/dap_chain_mempool.c
@@ -1449,7 +1449,7 @@ void chain_mempool_proc(struct dap_http_simple *cl_st, void * arg)
* @param sh HTTP server instance
* @param url URL string
*/
-void dap_chain_mempool_add_proc(dap_http_t * a_http_server, const char * a_url)
+void dap_chain_mempool_add_proc(dap_http_server_t * a_http_server, const char * a_url)
{
dap_http_simple_proc_add(a_http_server, a_url, 4096, chain_mempool_proc);
}
diff --git a/modules/mempool/include/dap_chain_mempool.h b/modules/mempool/include/dap_chain_mempool.h
index d18df1e803..a2221296a2 100644
--- a/modules/mempool/include/dap_chain_mempool.h
+++ b/modules/mempool/include/dap_chain_mempool.h
@@ -4,7 +4,7 @@
#include "dap_chain_net.h"
#include "dap_chain_datum.h"
#include "dap_chain_ledger.h"
-#include "dap_http.h"
+#include "dap_http_server.h"
#include "dap_cert.h"
#include "dap_chain_block_cache.h"
/*
@@ -56,7 +56,7 @@ dap_datum_mempool_t * dap_datum_mempool_deserialize(uint8_t *datum_mempool_str,
void dap_datum_mempool_clean(dap_datum_mempool_t *datum);
void dap_datum_mempool_free(dap_datum_mempool_t *datum);
-void dap_chain_mempool_add_proc(dap_http_t * a_http_server, const char * a_url);
+void dap_chain_mempool_add_proc(dap_http_server_t * a_http_server, const char * a_url);
void dap_chain_mempool_filter(dap_chain_t *a_chain, int *a_removed);
diff --git a/modules/net/dap_chain_net_news.h b/modules/net/dap_chain_net_news.h
deleted file mode 100644
index d3c82ce465..0000000000
--- a/modules/net/dap_chain_net_news.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Authors:
- * Alexander Lysikov <alexander.lysikov@demlabs.net>
- * DeM Labs Inc. https://demlabs.net
- * Kelvin Project https://github.com/kelvinblockchain
- * Copyright (c) 2020
- * All rights reserved.
-
- This file is part of DAP (Deus Applications Prototypes) the open source project
-
- DAP (Deus Applicaions Prototypes) 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.
-
- DAP 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 any DAP based project. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "dap_http.h"
-
-int dap_chain_net_news_init(dap_http_t * a_http);
-void dap_chain_net_srv_vpn_cdb_news_cache_reset(void);
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 31cb2caf90..ff455532b9 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -82,12 +82,8 @@
#include "dap_chain_block.h"
#include "dap_chain_cs_blocks.h"
-#ifndef _WIN32
-#include "dap_chain_net_news.h"
-#endif
#include "dap_chain_cell.h"
-
#include "dap_enc_base64.h"
#include "json.h"
#ifdef DAP_OS_UNIX
diff --git a/modules/net/include/dap_chain_net_bugreport.h b/modules/net/include/dap_chain_net_bugreport.h
index c930015f0b..d4ca32a594 100644
--- a/modules/net/include/dap_chain_net_bugreport.h
+++ b/modules/net/include/dap_chain_net_bugreport.h
@@ -22,6 +22,6 @@
along with any DAP based project. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "dap_http.h"
+#include "dap_http_server.h"
-int dap_chain_net_bugreport_init(dap_http_t * a_http);
+int dap_chain_net_bugreport_init(dap_http_server_t * a_http);
--
GitLab