mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
fixed bug in node server test page
This commit is contained in:
einhornimmond
parent
5af588f6bd
commit
3da83b638a
@ -47,9 +47,9 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
|
||||
Poco::AutoPtr<controller::NodeServer> node_server;
|
||||
Poco::AutoPtr<controller::User> user;
|
||||
Poco::AutoPtr<controller::HederaTopic> hedera_topic;
|
||||
int hedera_timeout = 15;
|
||||
int hedera_timeout = 9;
|
||||
|
||||
bool steps[6]; memset(steps, 0, 6 * sizeof(bool));
|
||||
bool steps[6]; memset(steps, 1, 6 * sizeof(bool));
|
||||
|
||||
|
||||
if(!form.empty())
|
||||
@ -85,6 +85,8 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
|
||||
step_temp = form.get(name, "");
|
||||
if(step_temp == "1") {
|
||||
steps[i] = true;
|
||||
} else {
|
||||
steps[i] = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -160,84 +162,120 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
|
||||
responseStream << "\t\t<div class=\"content\">";
|
||||
// end include header_large.cpsp
|
||||
responseStream << "\n";
|
||||
#line 80 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 82 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( getErrorsHtml() );
|
||||
responseStream << "\n";
|
||||
responseStream << "<div class=\"center-form-container\">\n";
|
||||
responseStream << "\t<!-- Tab links -->\n";
|
||||
responseStream << "\t<div class=\"tab\">\n";
|
||||
responseStream << "\t <button class=\"tablinks\" onclick=\"openTab(event, 'test-4')\">Test 4-Set (2 AddMember, Creation, Transfer)</button>\n";
|
||||
responseStream << "\t <button class=\"tablinks\" onclick=\"openTab(event, 'gn-jsonrpc')\" title=\"call via json-rpc to gradido node with getTransactions\">getTransactions</button>\n";
|
||||
responseStream << "\t <button class=\"tablinks ";
|
||||
#line 86 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(PAGE_RUN_4_SET_TEST == page) { responseStream << " active ";
|
||||
#line 86 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\" onclick=\"openTab(event, 'test-4')\">Test 4-Set (2 AddMember, Creation, Transfer)</button>\n";
|
||||
responseStream << "\t <button class=\"tablinks ";
|
||||
#line 87 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(PAGE_GET_TRANSACTION_RPC_CALL == page) { responseStream << " active ";
|
||||
#line 87 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\" onclick=\"openTab(event, 'gn-jsonrpc')\" title=\"call via json-rpc to gradido node with getTransactions\">getTransactions</button>\n";
|
||||
responseStream << "\t</div>\n";
|
||||
responseStream << "\t<div id=\"test-4\" class=\"tabcontent\">\n";
|
||||
responseStream << "\t<div id=\"test-4\" class=\"tabcontent\" ";
|
||||
#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(PAGE_RUN_4_SET_TEST == page) { responseStream << " style=\"display:block\" ";
|
||||
#line 89 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << ">\n";
|
||||
responseStream << "\t\t<div class=\"center-form-title\">\n";
|
||||
responseStream << "\t\t\t<h3>Test 4-Set (2 AddMember, Creation, Transfer)</</h3>\n";
|
||||
responseStream << "\t\t</div>\n";
|
||||
responseStream << "\t\t<div class=\"center-form-form\">\n";
|
||||
responseStream << "\t\t\t<form method=\"POST\" action=\"";
|
||||
#line 92 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 94 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( getBaseUrl() );
|
||||
responseStream << "/adminNodeServerTest\">\n";
|
||||
responseStream << "\t\t\t\t<p>1. Create two new accounts and show user public keys for comparisation</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" checked=\"checked\" name=\"step-2\" value=\"1\"/> 2. Send a add-member transaction to hedera topic with one signature (first user)</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" checked=\"checked\" name=\"step-3\" value=\"1\"/> 3. Send a add-member transaction to hedera topic with two signatures (first user and second user)</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" checked=\"checked\" name=\"step-4\" value=\"1\"/> 4. Send a creation transaction to second user, signed by first user</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" checked=\"checked\" name=\"step-5\" value=\"1\"/> 5. Send a transfer transaction from second user to first user signed by second user</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" checked=\"checked\" name=\"step-6\" value=\"1\"/> 6. Wait x seconds to give hedera time to process transactions</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" checked=\"checked\" name=\"step-7\" value=\"1\"/> 7. Ask choosen node for transaction and print result</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" ";
|
||||
#line 96 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(steps[0]) { responseStream << " checked=\"checked\" ";
|
||||
#line 96 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << " name=\"step-2\" value=\"1\"/> 2. Send a add-member transaction to hedera topic with one signature (first user)</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" ";
|
||||
#line 97 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(steps[1]) { responseStream << " checked=\"checked\" ";
|
||||
#line 97 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << " name=\"step-3\" value=\"1\"/> 3. Send a add-member transaction to hedera topic with two signatures (first user and second user)</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" ";
|
||||
#line 98 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(steps[2]) { responseStream << " checked=\"checked\" ";
|
||||
#line 98 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << " name=\"step-4\" value=\"1\"/> 4. Send a creation transaction to second user, signed by first user</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" ";
|
||||
#line 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(steps[3]) { responseStream << " checked=\"checked\" ";
|
||||
#line 99 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << " name=\"step-5\" value=\"1\"/> 5. Send a transfer transaction from second user to first user signed by second user</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" ";
|
||||
#line 100 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(steps[4]) { responseStream << " checked=\"checked\" ";
|
||||
#line 100 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << " name=\"step-6\" value=\"1\"/> 6. Wait x seconds to give hedera time to process transactions</p>\n";
|
||||
responseStream << "\t\t\t\t<p><input class=\"form-checkbox\" type=\"checkbox\" ";
|
||||
#line 101 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(steps[5]) { responseStream << " checked=\"checked\" ";
|
||||
#line 101 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << " name=\"step-7\" value=\"1\"/> 7. Ask choosen node for transaction and print result</p>\n";
|
||||
responseStream << "\t\t\t\n";
|
||||
responseStream << "\t\t\t\t<label class=\"form-label\" for=\"test-node-servers\">Node Server for tests</label>\n";
|
||||
responseStream << "\t\t\t\t";
|
||||
#line 102 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 104 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(node_servers.size() == 0) { responseStream << "\n";
|
||||
responseStream << "\t\t\t\t\t<a href=\"";
|
||||
#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 105 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( getBaseUrl() );
|
||||
responseStream << "/nodes\"><span class=\"link-title\">Edit Node-Servers</span></a>\n";
|
||||
responseStream << "\t\t\t\t";
|
||||
#line 104 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 106 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t\t<select name=\"test-node-servers\" id=\"test-node-servers\">\n";
|
||||
responseStream << "\t\t\t\t\t";
|
||||
#line 106 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
for(auto it = node_servers.begin(); it != node_servers.end(); it++) {
|
||||
auto model = (*it)->getModel();
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t\t\t\t\t<option title=\"";
|
||||
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 111 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->toString() );
|
||||
responseStream << "\" value=\"";
|
||||
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 111 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->getID() );
|
||||
responseStream << "\" ";
|
||||
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 111 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(!node_server.isNull() && node_server->getModel()->getID() == model->getID()) { responseStream << "selected=\"selected\"";
|
||||
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 111 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << ">";
|
||||
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 111 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->getUrlWithPort() );
|
||||
responseStream << ", group: ";
|
||||
#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 111 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->getGroupId() );
|
||||
responseStream << "</option>\n";
|
||||
responseStream << "\t\t\t\t\t";
|
||||
#line 110 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 112 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t\t</select>\n";
|
||||
responseStream << "\t\t\t\t<label class=\"form-label\" for=\"test-hedera-topic\">Hedera Topic for tests</label>\n";
|
||||
responseStream << "\t\t\t\t";
|
||||
#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 115 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(hedera_topics.size() == 0) { responseStream << "\n";
|
||||
responseStream << "\t\t\t\t\t<a href=\"";
|
||||
#line 114 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 116 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( getBaseUrl() );
|
||||
responseStream << "/topic\"><span class=\"link-title\">Edit Hedera-Topics</span></a>\n";
|
||||
responseStream << "\t\t\t\t";
|
||||
#line 115 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 117 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t\t<select name=\"test-hedera-topic\" id=\"test-hedera-topic\">\n";
|
||||
responseStream << "\t\t\t\t\t";
|
||||
#line 117 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 119 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
for(auto it = hedera_topics.begin(); it != hedera_topics.end(); it++) {
|
||||
auto model = (*it)->getModel();
|
||||
auto hedera_account = (*it)->getAutoRenewAccount();
|
||||
@ -246,80 +284,84 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
|
||||
}
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t\t\t\t\t<option title=\"";
|
||||
#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->toString() );
|
||||
responseStream << "\" value=\"";
|
||||
#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->getID() );
|
||||
responseStream << "\" ";
|
||||
#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(!hedera_topic.isNull() && hedera_topic->getModel()->getID() == model->getID()) { responseStream << "selected=\"selected\"";
|
||||
#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << ">";
|
||||
#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->getName() );
|
||||
responseStream << ", group: ";
|
||||
#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->getGroupId() );
|
||||
responseStream << "</option>\n";
|
||||
responseStream << "\t\t\t\t\t";
|
||||
#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 127 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t\t</select>\n";
|
||||
responseStream << "\t\t\t\t<label class=\"form-label\" for=\"test-timeout\">Timeout waiting for hedera in seconds</label>\n";
|
||||
responseStream << "\t\t\t\t<input name=\"test-timeout\" id=\"test-timeout\" type=\"number\" value=\"";
|
||||
#line 128 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 130 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( hedera_timeout );
|
||||
responseStream << "\"> seconds \n";
|
||||
responseStream << "\t\t\t\t<input class=\"center-form-submit form-button\" type=\"submit\" name=\"submit\" value=\"Run 4-Test\">\n";
|
||||
responseStream << "\t\t\t</form>\n";
|
||||
responseStream << "\t\t</div>\n";
|
||||
responseStream << "\t</div>\n";
|
||||
responseStream << "\t<div id=\"gn-jsonrpc\" class=\"tabcontent\">\n";
|
||||
responseStream << "\t<div id=\"gn-jsonrpc\" class=\"tabcontent\" ";
|
||||
#line 135 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(PAGE_GET_TRANSACTION_RPC_CALL == page) { responseStream << " style=\"display:block\" ";
|
||||
#line 135 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << ">\n";
|
||||
responseStream << "\t\t<div class=\"center-form-title\">\n";
|
||||
responseStream << "\t\t\t<h3>Test 4-Set (2 AddMember, Creation, Transfer)</</h3>\n";
|
||||
responseStream << "\t\t</div>\n";
|
||||
responseStream << "\t\t<div class=\"center-form-form\">\n";
|
||||
responseStream << "\t\t\t<form method=\"POST\" action=\"";
|
||||
#line 138 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 140 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( getBaseUrl() );
|
||||
responseStream << "/adminNodeServerTest\">\n";
|
||||
responseStream << "\t\t\t\t<label class=\"form-label\" for=\"test-node-servers\">Node Server to call</label>\n";
|
||||
responseStream << "\t\t\t\t";
|
||||
#line 140 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(node_servers.size() == 0) { responseStream << "\n";
|
||||
responseStream << "\t\t\t\t\t<a href=\"";
|
||||
#line 141 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 143 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( getBaseUrl() );
|
||||
responseStream << "/nodes\"><span class=\"link-title\">Edit Node-Servers</span></a>\n";
|
||||
responseStream << "\t\t\t\t";
|
||||
#line 142 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 144 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t\t<select name=\"test-node-servers\" id=\"test-node-servers\">\n";
|
||||
responseStream << "\t\t\t\t\t";
|
||||
#line 144 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 146 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
for(auto it = node_servers.begin(); it != node_servers.end(); it++) {
|
||||
auto model = (*it)->getModel();
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t\t\t\t\t<option title=\"";
|
||||
#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->toString() );
|
||||
responseStream << "\" value=\"";
|
||||
#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->getID() );
|
||||
responseStream << "\" ";
|
||||
#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(!node_server.isNull() && node_server->getModel()->getID() == model->getID()) { responseStream << "selected=\"selected\"";
|
||||
#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << ">";
|
||||
#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->getUrlWithPort() );
|
||||
responseStream << ", group: ";
|
||||
#line 147 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 149 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( model->getGroupId() );
|
||||
responseStream << "</option>\n";
|
||||
responseStream << "\t\t\t\t\t";
|
||||
#line 148 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 150 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t\t</select>\n";
|
||||
responseStream << "\t\t\t\t<input class=\"center-form-submit form-button\" type=\"submit\" name=\"submit\" value=\"json-rpc getTransactions\">\n";
|
||||
@ -327,13 +369,13 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
|
||||
responseStream << "\t\t</div>\n";
|
||||
responseStream << "\t</div>\n";
|
||||
responseStream << "\t";
|
||||
#line 154 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 156 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(PAGE_RUN_4_SET_TEST == page && !hedera_topic.isNull() && !node_server.isNull()) { responseStream << "\n";
|
||||
responseStream << "\t<ul>\n";
|
||||
responseStream << "\t\t<li>\n";
|
||||
responseStream << "\t\t\t<p>1. Create two new accounts and show user public keys for comparisation: </p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 158 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 160 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
|
||||
Profiler time2;
|
||||
auto group_id = hedera_topic->getModel()->getGroupId();
|
||||
@ -355,138 +397,138 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
|
||||
user_2->login(password2);
|
||||
responseStream << "\t\t\t\n";
|
||||
responseStream << "\t\t\t<p>User 1: ";
|
||||
#line 178 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 180 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( user_1->getPublicHex() );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t\t\t<p>User 2: ";
|
||||
#line 179 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 181 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( user_2->getPublicHex() );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t\t\t<p>Time: ";
|
||||
#line 180 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 182 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( time2.string() );
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t</li>\n";
|
||||
responseStream << "\t\t<li>\n";
|
||||
responseStream << "\t\t\t<p>2. Send a add-member transaction to hedera topic with one signature (first user)</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 184 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 186 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
|
||||
time2.reset();
|
||||
if(!steps[0]) { responseStream << "\n";
|
||||
responseStream << "\t\t\t\t<p>skipped</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 188 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 190 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} else {
|
||||
auto transaction1 = model::gradido::Transaction::createGroupMemberUpdate(user_1, user_group);
|
||||
transaction1->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(2);
|
||||
transaction1->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(1);
|
||||
transaction1->sign(user_1);
|
||||
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t\t<p>";
|
||||
#line 194 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 196 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction1->getTransactionAsJson(true)) );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 195 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 197 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t<p>Time: ";
|
||||
#line 196 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 198 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( time2.string() );
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t</li>\n";
|
||||
responseStream << "\t\t<li>\n";
|
||||
responseStream << "\t\t\t<p>3. Send a add-member transaction to hedera topic with two signatures (first user and second user)</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 200 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 202 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
|
||||
time2.reset();
|
||||
if(!steps[1]) { responseStream << "\n";
|
||||
responseStream << "\t\t\t\t<p>skipped</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 204 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 206 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} else {
|
||||
auto transaction2 = model::gradido::Transaction::createGroupMemberUpdate(user_2, user_group);
|
||||
transaction2->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(3);
|
||||
transaction2->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(2);
|
||||
transaction2->sign(user_2);
|
||||
transaction2->sign(user_1);
|
||||
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t\t<p>";
|
||||
#line 211 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 213 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction2->getTransactionAsJson(true)) );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 212 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 214 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t<p>Time: ";
|
||||
#line 213 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 215 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( time2.string() );
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t</li>\n";
|
||||
responseStream << "\t\t<li>\n";
|
||||
responseStream << "\t\t\t<p>4. Send a creation transaction to second user, signed by first user</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 217 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 219 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
|
||||
time2.reset();
|
||||
if(!steps[2]) { responseStream << "\n";
|
||||
responseStream << "\t\t\t\t<p>skipped</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 221 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 223 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} else {
|
||||
auto transaction3 = model::gradido::Transaction::createCreation(user_2, 1000, Poco::DateTime(), "Test Creation");
|
||||
auto transaction3 = model::gradido::Transaction::createCreation(user_2, 10000000, Poco::DateTime(), "Test Creation");
|
||||
transaction3->sign(user_1);
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t\t<p>";
|
||||
#line 225 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 227 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction3->getTransactionAsJson(true)) );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 226 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 228 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t<p>Time: ";
|
||||
#line 227 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 229 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( time2.string() );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t\t</li>\n";
|
||||
responseStream << "\t\t<li>\n";
|
||||
responseStream << "\t\t\t<p>5. Send a transfer transaction from second user to first user signed by second user</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 231 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 233 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
|
||||
time2.reset();
|
||||
if(!steps[3]) { responseStream << "\n";
|
||||
responseStream << "\t\t\t\t<p>skipped</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 235 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 237 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} else {
|
||||
auto user_1_pubkey = user_1->getModel()->getPublicKeyCopy();
|
||||
auto transaction4 = model::gradido::Transaction::createTransfer(user_2, user_1_pubkey, user_group, 500, "Test Transfer");
|
||||
auto transaction4 = model::gradido::Transaction::createTransfer(user_2, user_1_pubkey, user_group, 5000000, "Test Transfer");
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t\t<p>";
|
||||
#line 239 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 241 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( DataTypeConverter::replaceNewLineWithBr(transaction4[0]->getTransactionAsJson(true)) );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 240 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 242 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t<p>Time: ";
|
||||
#line 241 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 243 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( time2.string() );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t\t</li>\n";
|
||||
responseStream << "\t\t<li>\n";
|
||||
responseStream << "\t\t\t<p>6. Wait ";
|
||||
#line 244 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 246 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( hedera_timeout );
|
||||
responseStream << " seconds to give hedera time to process transactions</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 245 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(!steps[3]) { responseStream << "\n";
|
||||
#line 247 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(!steps[4]) { responseStream << "\n";
|
||||
responseStream << "\t\t\t\t<p>skipped</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 247 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 249 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} else {
|
||||
Poco::Thread::sleep(hedera_timeout * 1000);
|
||||
} responseStream << "\n";
|
||||
@ -494,11 +536,12 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
|
||||
responseStream << "\t\t<li>\n";
|
||||
responseStream << "\t\t\t<p>7. Ask choosen node for transaction and print result</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 253 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
if(!steps[3] || node_server.isNull()) { responseStream << "\n";
|
||||
responseStream << "\t\t\t\t<p>skipped</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 255 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
time2.reset();
|
||||
if(!steps[5] || node_server.isNull()) {
|
||||
responseStream << "<p>skipped</p>\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 258 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} else {
|
||||
auto node_server_model = node_server->getModel();
|
||||
JsonRPCRequest jsonrpc(node_server_model->getUrl(), node_server_model->getPort());
|
||||
@ -510,17 +553,22 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
|
||||
std::stringstream ss;
|
||||
Poco::JSON::Stringifier::stringify(gn_answear, ss, 4, -1, Poco::JSON_PRESERVE_KEY_ORDER); responseStream << "\n";
|
||||
responseStream << "\t\t\t\t\t";
|
||||
#line 265 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 268 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( DataTypeConverter::replaceNewLineWithBr(ss.str()) );
|
||||
#line 265 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 268 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
|
||||
}
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\t\t<p>Time: ";
|
||||
#line 271 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( time2.string() );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t\t</li>\n";
|
||||
responseStream << "\t</ul>\n";
|
||||
responseStream << "\t";
|
||||
#line 270 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 274 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} else if(PAGE_GET_TRANSACTION_RPC_CALL == page && !node_server.isNull()) {
|
||||
Profiler time3;
|
||||
auto node_server_model = node_server->getModel();
|
||||
auto user_group = controller::Group::load(node_server_model->getGroupId());
|
||||
JsonRPCRequest jsonrpc(node_server_model->getUrl(), node_server_model->getPort());
|
||||
@ -533,16 +581,23 @@ void AdminNodeServerTestPage::handleRequest(Poco::Net::HTTPServerRequest& reques
|
||||
Poco::JSON::Stringifier::stringify(gn_answear, ss, 4, -1, Poco::JSON_PRESERVE_KEY_ORDER);
|
||||
//printf("result: %s\n", ss.str().data()); responseStream << "\n";
|
||||
responseStream << "\t\t\t";
|
||||
#line 282 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 287 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( DataTypeConverter::replaceNewLineWithBr(ss.str()) );
|
||||
#line 282 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 287 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
|
||||
}
|
||||
} responseStream << "\n";
|
||||
responseStream << "\n";
|
||||
responseStream << "\t\t<p>Time: ";
|
||||
#line 290 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( time3.string() );
|
||||
responseStream << "</p>\n";
|
||||
responseStream << "\t";
|
||||
#line 291 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
} responseStream << "\n";
|
||||
responseStream << "\t\n";
|
||||
responseStream << "</div>\n";
|
||||
responseStream << "<script type=\"text/javascript\" src=\"";
|
||||
#line 287 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
#line 294 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminNodeServerTest.cpsp"
|
||||
responseStream << ( ServerConfig::g_php_serverPath );
|
||||
responseStream << "/js/tabs.js\"></script>\n";
|
||||
// begin include footer.cpsp
|
||||
|
||||
@ -340,20 +340,19 @@ namespace DataTypeConverter
|
||||
|
||||
for (auto it = json->begin(); it != json->end(); it++)
|
||||
{
|
||||
if (it->first == "sigPair")
|
||||
{
|
||||
int zahl = 1;
|
||||
}
|
||||
if (json->isObject(it)) {
|
||||
auto local_json = it->second.extract<Poco::JSON::Object::Ptr>();
|
||||
count_replacements += replaceBase64WithHex(local_json);
|
||||
json->set(it->first, local_json);
|
||||
}
|
||||
else if (json->isArray(it)) {
|
||||
|
||||
auto local_json = it->second.extract<Poco::JSON::Array::Ptr>();
|
||||
count_replacements += replaceBase64WithHex(local_json);
|
||||
json->set(it->first, local_json);
|
||||
}
|
||||
else if (it->second.isString())
|
||||
{
|
||||
if (it->first == "amount") continue;
|
||||
auto field_value = it->second.extract<std::string>();
|
||||
if(!g_rexExpBase64.match(field_value)) continue;
|
||||
|
||||
@ -362,7 +361,7 @@ namespace DataTypeConverter
|
||||
|
||||
auto hex = binToHex(bin);
|
||||
mm->releaseMemory(bin);
|
||||
json->set(it->first, hex);
|
||||
json->set(it->first, hex.substr(0, hex.size()-1));
|
||||
count_replacements++;
|
||||
}
|
||||
}
|
||||
@ -370,6 +369,43 @@ namespace DataTypeConverter
|
||||
return count_replacements;
|
||||
}
|
||||
|
||||
int replaceBase64WithHex(Poco::JSON::Array::Ptr json)
|
||||
{
|
||||
auto mm = MemoryManager::getInstance();
|
||||
int count_replacements = 0;
|
||||
int count = 0;
|
||||
for (auto it = json->begin(); it != json->end(); it++)
|
||||
{
|
||||
if (json->isObject(it)) {
|
||||
|
||||
auto local_json = it->extract<Poco::JSON::Object::Ptr>();
|
||||
count_replacements += replaceBase64WithHex(local_json);
|
||||
json->set(count, local_json);
|
||||
}
|
||||
else if (json->isArray(it)) {
|
||||
auto local_json = it->extract<Poco::JSON::Array::Ptr>();
|
||||
count_replacements += replaceBase64WithHex(local_json);
|
||||
json->set(count, local_json);
|
||||
}
|
||||
else if (it->isString())
|
||||
{
|
||||
auto field_value = it->extract<std::string>();
|
||||
if (!g_rexExpBase64.match(field_value)) continue;
|
||||
|
||||
auto bin = base64ToBin(field_value);
|
||||
if (!bin) continue;
|
||||
|
||||
auto hex = binToHex(bin);
|
||||
mm->releaseMemory(bin);
|
||||
json->set(count, hex.substr(0, hex.size()-1));
|
||||
count_replacements++;
|
||||
}
|
||||
count++;
|
||||
}
|
||||
|
||||
return count_replacements;
|
||||
}
|
||||
|
||||
std::string replaceNewLineWithBr(std::string& in)
|
||||
{
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
#include "Poco/Nullable.h"
|
||||
#include "Poco/Data/LOB.h"
|
||||
#include "Poco/JSON/Object.h"
|
||||
#include "Poco/JSON/Array.h"
|
||||
#include "../SingletonManager/LanguageManager.h"
|
||||
|
||||
#include "../proto/hedera/Timestamp.pb.h"
|
||||
@ -63,6 +64,7 @@ namespace DataTypeConverter {
|
||||
//! \brief go through json object and replace every string entry in base64 format into hex format
|
||||
//! \return count of replaced strings
|
||||
int replaceBase64WithHex(Poco::JSON::Object::Ptr json);
|
||||
int replaceBase64WithHex(Poco::JSON::Array::Ptr json);
|
||||
std::string replaceNewLineWithBr(std::string& in);
|
||||
};
|
||||
|
||||
|
||||
@ -31,9 +31,9 @@ enum PageType
|
||||
Poco::AutoPtr<controller::NodeServer> node_server;
|
||||
Poco::AutoPtr<controller::User> user;
|
||||
Poco::AutoPtr<controller::HederaTopic> hedera_topic;
|
||||
int hedera_timeout = 15;
|
||||
int hedera_timeout = 9;
|
||||
|
||||
bool steps[6]; memset(steps, 0, 6 * sizeof(bool));
|
||||
bool steps[6]; memset(steps, 1, 6 * sizeof(bool));
|
||||
|
||||
|
||||
if(!form.empty())
|
||||
@ -69,6 +69,8 @@ enum PageType
|
||||
step_temp = form.get(name, "");
|
||||
if(step_temp == "1") {
|
||||
steps[i] = true;
|
||||
} else {
|
||||
steps[i] = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -81,22 +83,22 @@ enum PageType
|
||||
<div class="center-form-container">
|
||||
<!-- Tab links -->
|
||||
<div class="tab">
|
||||
<button class="tablinks" onclick="openTab(event, 'test-4')">Test 4-Set (2 AddMember, Creation, Transfer)</button>
|
||||
<button class="tablinks" onclick="openTab(event, 'gn-jsonrpc')" title="call via json-rpc to gradido node with getTransactions">getTransactions</button>
|
||||
<button class="tablinks <% if(PAGE_RUN_4_SET_TEST == page) { %> active <% } %>" onclick="openTab(event, 'test-4')">Test 4-Set (2 AddMember, Creation, Transfer)</button>
|
||||
<button class="tablinks <% if(PAGE_GET_TRANSACTION_RPC_CALL == page) { %> active <% } %>" onclick="openTab(event, 'gn-jsonrpc')" title="call via json-rpc to gradido node with getTransactions">getTransactions</button>
|
||||
</div>
|
||||
<div id="test-4" class="tabcontent">
|
||||
<div id="test-4" class="tabcontent" <% if(PAGE_RUN_4_SET_TEST == page) { %> style="display:block" <% } %>>
|
||||
<div class="center-form-title">
|
||||
<h3>Test 4-Set (2 AddMember, Creation, Transfer)</</h3>
|
||||
</div>
|
||||
<div class="center-form-form">
|
||||
<form method="POST" action="<%= getBaseUrl() %>/adminNodeServerTest">
|
||||
<p>1. Create two new accounts and show user public keys for comparisation</p>
|
||||
<p><input class="form-checkbox" type="checkbox" checked="checked" name="step-2" value="1"/> 2. Send a add-member transaction to hedera topic with one signature (first user)</p>
|
||||
<p><input class="form-checkbox" type="checkbox" checked="checked" name="step-3" value="1"/> 3. Send a add-member transaction to hedera topic with two signatures (first user and second user)</p>
|
||||
<p><input class="form-checkbox" type="checkbox" checked="checked" name="step-4" value="1"/> 4. Send a creation transaction to second user, signed by first user</p>
|
||||
<p><input class="form-checkbox" type="checkbox" checked="checked" name="step-5" value="1"/> 5. Send a transfer transaction from second user to first user signed by second user</p>
|
||||
<p><input class="form-checkbox" type="checkbox" checked="checked" name="step-6" value="1"/> 6. Wait x seconds to give hedera time to process transactions</p>
|
||||
<p><input class="form-checkbox" type="checkbox" checked="checked" name="step-7" value="1"/> 7. Ask choosen node for transaction and print result</p>
|
||||
<p><input class="form-checkbox" type="checkbox" <% if(steps[0]) { %> checked="checked" <% } %> name="step-2" value="1"/> 2. Send a add-member transaction to hedera topic with one signature (first user)</p>
|
||||
<p><input class="form-checkbox" type="checkbox" <% if(steps[1]) { %> checked="checked" <% } %> name="step-3" value="1"/> 3. Send a add-member transaction to hedera topic with two signatures (first user and second user)</p>
|
||||
<p><input class="form-checkbox" type="checkbox" <% if(steps[2]) { %> checked="checked" <% } %> name="step-4" value="1"/> 4. Send a creation transaction to second user, signed by first user</p>
|
||||
<p><input class="form-checkbox" type="checkbox" <% if(steps[3]) { %> checked="checked" <% } %> name="step-5" value="1"/> 5. Send a transfer transaction from second user to first user signed by second user</p>
|
||||
<p><input class="form-checkbox" type="checkbox" <% if(steps[4]) { %> checked="checked" <% } %> name="step-6" value="1"/> 6. Wait x seconds to give hedera time to process transactions</p>
|
||||
<p><input class="form-checkbox" type="checkbox" <% if(steps[5]) { %> checked="checked" <% } %> name="step-7" value="1"/> 7. Ask choosen node for transaction and print result</p>
|
||||
|
||||
<label class="form-label" for="test-node-servers">Node Server for tests</label>
|
||||
<% if(node_servers.size() == 0) { %>
|
||||
@ -130,7 +132,7 @@ enum PageType
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div id="gn-jsonrpc" class="tabcontent">
|
||||
<div id="gn-jsonrpc" class="tabcontent" <% if(PAGE_GET_TRANSACTION_RPC_CALL == page) { %> style="display:block" <% } %>>
|
||||
<div class="center-form-title">
|
||||
<h3>Test 4-Set (2 AddMember, Creation, Transfer)</</h3>
|
||||
</div>
|
||||
@ -187,7 +189,7 @@ enum PageType
|
||||
<p>skipped</p>
|
||||
<% } else {
|
||||
auto transaction1 = model::gradido::Transaction::createGroupMemberUpdate(user_1, user_group);
|
||||
transaction1->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(2);
|
||||
transaction1->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(1);
|
||||
transaction1->sign(user_1);
|
||||
|
||||
%>
|
||||
@ -203,7 +205,7 @@ enum PageType
|
||||
<p>skipped</p>
|
||||
<% } else {
|
||||
auto transaction2 = model::gradido::Transaction::createGroupMemberUpdate(user_2, user_group);
|
||||
transaction2->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(3);
|
||||
transaction2->getTransactionBody()->getGroupMemberUpdate()->setMinSignatureCount(2);
|
||||
transaction2->sign(user_2);
|
||||
transaction2->sign(user_1);
|
||||
|
||||
@ -219,7 +221,7 @@ enum PageType
|
||||
if(!steps[2]) { %>
|
||||
<p>skipped</p>
|
||||
<% } else {
|
||||
auto transaction3 = model::gradido::Transaction::createCreation(user_2, 1000, Poco::DateTime(), "Test Creation");
|
||||
auto transaction3 = model::gradido::Transaction::createCreation(user_2, 10000000, Poco::DateTime(), "Test Creation");
|
||||
transaction3->sign(user_1);
|
||||
%>
|
||||
<p><%= DataTypeConverter::replaceNewLineWithBr(transaction3->getTransactionAsJson(true)) %></p>
|
||||
@ -234,7 +236,7 @@ enum PageType
|
||||
<p>skipped</p>
|
||||
<% } else {
|
||||
auto user_1_pubkey = user_1->getModel()->getPublicKeyCopy();
|
||||
auto transaction4 = model::gradido::Transaction::createTransfer(user_2, user_1_pubkey, user_group, 500, "Test Transfer");
|
||||
auto transaction4 = model::gradido::Transaction::createTransfer(user_2, user_1_pubkey, user_group, 5000000, "Test Transfer");
|
||||
%>
|
||||
<p><%= DataTypeConverter::replaceNewLineWithBr(transaction4[0]->getTransactionAsJson(true)) %></p>
|
||||
<% } %>
|
||||
@ -242,7 +244,7 @@ enum PageType
|
||||
</li>
|
||||
<li>
|
||||
<p>6. Wait <%= hedera_timeout %> seconds to give hedera time to process transactions</p>
|
||||
<% if(!steps[3]) { %>
|
||||
<% if(!steps[4]) { %>
|
||||
<p>skipped</p>
|
||||
<% } else {
|
||||
Poco::Thread::sleep(hedera_timeout * 1000);
|
||||
@ -250,8 +252,9 @@ enum PageType
|
||||
</li>
|
||||
<li>
|
||||
<p>7. Ask choosen node for transaction and print result</p>
|
||||
<% if(!steps[3] || node_server.isNull()) { %>
|
||||
<p>skipped</p>
|
||||
<% time2.reset();
|
||||
if(!steps[5] || node_server.isNull()) {
|
||||
%><p>skipped</p>
|
||||
<% } else {
|
||||
auto node_server_model = node_server->getModel();
|
||||
JsonRPCRequest jsonrpc(node_server_model->getUrl(), node_server_model->getPort());
|
||||
@ -265,9 +268,11 @@ enum PageType
|
||||
<%= DataTypeConverter::replaceNewLineWithBr(ss.str()) %><%
|
||||
}
|
||||
} %>
|
||||
<p>Time: <%= time2.string() %></p>
|
||||
</li>
|
||||
</ul>
|
||||
<% } else if(PAGE_GET_TRANSACTION_RPC_CALL == page && !node_server.isNull()) {
|
||||
Profiler time3;
|
||||
auto node_server_model = node_server->getModel();
|
||||
auto user_group = controller::Group::load(node_server_model->getGroupId());
|
||||
JsonRPCRequest jsonrpc(node_server_model->getUrl(), node_server_model->getPort());
|
||||
@ -281,7 +286,9 @@ enum PageType
|
||||
//printf("result: %s\n", ss.str().data());%>
|
||||
<%= DataTypeConverter::replaceNewLineWithBr(ss.str()) %><%
|
||||
}
|
||||
} %>
|
||||
%>
|
||||
<p>Time: <%= time3.string() %></p>
|
||||
<% } %>
|
||||
|
||||
</div>
|
||||
<script type="text/javascript" src="<%= ServerConfig::g_php_serverPath %>/js/tabs.js"></script>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user