From ebf564db41f7ad476b4c92fc40ccb96d05d86a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?=
<alexander.lysikov@demlabs.net>
Date: Thu, 30 May 2019 21:47:40 +0500
Subject: [PATCH] update modules and update global_db test
---
.../configs/network/kelvin-testnet.cfg.tpl | 2 +-
libdap | 2 +-
libdap-chain | 2 +-
libdap-chain-gdb | 2 +-
libdap-chain-global-db | 2 +-
libdap-chain-net | 2 +-
libdap-client | 2 +-
libdap-crypto | 2 +-
libdap-stream-ch-chain | 2 +-
test/dap_global_db_test.c | 20 +++++++++----------
10 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dist/share/configs/network/kelvin-testnet.cfg.tpl b/dist/share/configs/network/kelvin-testnet.cfg.tpl
index e8b24b01e..eec07ab4b 100755
--- a/dist/share/configs/network/kelvin-testnet.cfg.tpl
+++ b/dist/share/configs/network/kelvin-testnet.cfg.tpl
@@ -10,7 +10,7 @@ node-alias=addr-%node_addr%
gdb_groups_prefix=kelvin.testnet
seed_nodes_ipv4=[159.89.228.115,165.227.17.239,104.248.89.205,157.230.240.104,167.99.87.197,46.101.149.240,159.89.122.48]
seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1,kelvin.testnet.root.2,kelvin.testnet.root.3,kelvin.testnet.root.4,kelvin.testnet.root.5,kelvin.testnet.root.6]
-seed_nodes_addr=[ffff::0000::0000::0001,ffff::0000::0000::0002,ffff::0000::0000::0003,ffff::0000::0000::0004,ffff::0000::0000::0005,ffff::0000::0000::0006,ffff::0000::0000::0007]
+seed_nodes_addrs=[ffff::0000::0000::0001,ffff::0000::0000::0002,ffff::0000::0000::0003,ffff::0000::0000::0004,ffff::0000::0000::0005,ffff::0000::0000::0006,ffff::0000::0000::0007]
#[dag-poa]
#events-sign-cert=mycert
diff --git a/libdap b/libdap
index d40599923..5b72cc303 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit d40599923167e43addcc61696b8ea75b2e2abcd7
+Subproject commit 5b72cc303107680535c4591313033611b01c4a0b
diff --git a/libdap-chain b/libdap-chain
index 490e82c39..a5ed7b7f5 160000
--- a/libdap-chain
+++ b/libdap-chain
@@ -1 +1 @@
-Subproject commit 490e82c39d8d5cde405efd05214cf892e56887d0
+Subproject commit a5ed7b7f5e622ed346c9cdac1eac5a986c1ec3e7
diff --git a/libdap-chain-gdb b/libdap-chain-gdb
index 28b605005..439539df4 160000
--- a/libdap-chain-gdb
+++ b/libdap-chain-gdb
@@ -1 +1 @@
-Subproject commit 28b6050053ea76b24a5dbb5b41fdaac60610dd28
+Subproject commit 439539df4ad478f22a9184b81001433ab568ba07
diff --git a/libdap-chain-global-db b/libdap-chain-global-db
index 4d3ba184d..beea56f88 160000
--- a/libdap-chain-global-db
+++ b/libdap-chain-global-db
@@ -1 +1 @@
-Subproject commit 4d3ba184d26c0f9426e9052bd6771122a7e2ba47
+Subproject commit beea56f88e88015fa9f6cefb0e0d0d472449ff78
diff --git a/libdap-chain-net b/libdap-chain-net
index c12ea90a5..dd7aedf07 160000
--- a/libdap-chain-net
+++ b/libdap-chain-net
@@ -1 +1 @@
-Subproject commit c12ea90a5cc2efb0be375da40ac0b41f3e637fee
+Subproject commit dd7aedf07314ed41b7f29e1efb70134c8963f050
diff --git a/libdap-client b/libdap-client
index c795063f3..5b9aaf702 160000
--- a/libdap-client
+++ b/libdap-client
@@ -1 +1 @@
-Subproject commit c795063f3055b44751d1507bca8d2ea525b090d0
+Subproject commit 5b9aaf7024a723b11f5d664159dd36cbecf9a809
diff --git a/libdap-crypto b/libdap-crypto
index 15c4ba05a..ff63d7626 160000
--- a/libdap-crypto
+++ b/libdap-crypto
@@ -1 +1 @@
-Subproject commit 15c4ba05ada6cc0b8d4a56c58978ae1e2b095702
+Subproject commit ff63d762657f9687173db825705b8bf4b958abee
diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain
index 2e5210de9..688472966 160000
--- a/libdap-stream-ch-chain
+++ b/libdap-stream-ch-chain
@@ -1 +1 @@
-Subproject commit 2e5210de96674e00ec08a510fcbf92e34cdf4346
+Subproject commit 688472966c733da5b555e28f2b23311b3cf60cf2
diff --git a/test/dap_global_db_test.c b/test/dap_global_db_test.c
index 462a06263..c3da75b9c 100644
--- a/test/dap_global_db_test.c
+++ b/test/dap_global_db_test.c
@@ -29,9 +29,9 @@ static void test_write_read_one(void)
for(size_t i = 0; i < l_store_obj->value_len; i++) {
l_store_obj->value[i] = rand();
}
- int ret = dap_db_add(l_store_obj, l_store_count);
+ int ret = dap_chain_global_db_driver_add(l_store_obj, l_store_count);
- dap_store_obj_t *l_store_obj2 = dap_db_read_data(l_store_obj->group, l_store_obj->key, NULL);
+ dap_store_obj_t *l_store_obj2 = dap_chain_global_db_driver_read(l_store_obj->group, l_store_obj->key, NULL);
dap_assert_PIF(l_store_obj2, "Read global_db entry");
@@ -62,7 +62,7 @@ static void test_close_db(void)
static void test_write_db_count(void)
{
- int a_count = 100000;
+ int a_count = 20000;
dap_store_obj_t *l_store_obj = DAP_NEW_Z_SIZE(dap_store_obj_t, sizeof(dap_store_obj_t) * a_count);
size_t l_store_count = 1;
for(size_t n = 0; n < a_count; n++) {
@@ -78,14 +78,14 @@ static void test_write_db_count(void)
}
}
//dap_test_msg("Start test write dap_global_db %d record", a_count);
- int ret = dap_db_add(l_store_obj, a_count);
+ int ret = dap_chain_global_db_driver_add(l_store_obj, a_count);
//dap_test_msg("Read first record");
- dap_store_obj_t *l_store_obj2 = dap_db_read_data(l_store_obj->group, l_store_obj->key, NULL);
+ dap_store_obj_t *l_store_obj2 = dap_chain_global_db_driver_read(l_store_obj->group, l_store_obj->key, NULL);
dap_store_obj_free(l_store_obj2, 1);
//dap_test_msg("Start test read dap_global_db %d record", a_count);
for(size_t n = 1; n < a_count; n++) {
- dap_store_obj_t *l_store_obj2 = dap_db_read_data(l_store_obj->group, l_store_obj->key, NULL);
+ dap_store_obj_t *l_store_obj2 = dap_chain_global_db_driver_read(l_store_obj->group, l_store_obj->key, NULL);
dap_assert_PIF(l_store_obj2, "Read data");
// compare l_store_obj and l_store_obj
if(l_store_obj->timestamp == l_store_obj2->timestamp &&
@@ -117,17 +117,17 @@ void dap_global_db_tests_run(void)
test_write_read_one();
// test_write_db_count(1000000);
- benchmark_mgs_time("Read and Write in blobal_db 20000 times",
+ benchmark_mgs_time("Read and Write in global_db 20000 records",
benchmark_test_time(test_write_db_count, 1));
- dap_assert(1, "Test dap_global_db: write and read 20000 records");
+ //dap_assert(1, "Test dap_global_db: write and read 20000 records");
/*
- benchmark_mgs_time("Read and Write in blobal_db 100 times",
+ benchmark_mgs_time("Read and Write in global_db 100 times",
benchmark_test_time(test_write_db_count, 1));
dap_assert(1, "Test dap_global_db 100 records");
*/
-// benchmark_mgs_rate("Read and Write in blobal_db",
+// benchmark_mgs_rate("Read and Write in global_db",
// benchmark_test_rate(test_write_db_count, 2000));
//dap_usleep(2 * DAP_USEC_PER_SEC);
--
GitLab