[WIP] Update flatbuffer_service::toConsensusEvent()

romo · Apr 15, 2017 · 274b0f7 · 274b0f7
1 parent 9a43f53
commit 274b0f7
Show file tree

Hide file tree

Showing 10 changed files with 526 additions and 257 deletions.
diff --git a/config/config.json b/config/config.json
@@ -1,14 +1 @@
-{
-  "database_path":"/tmp/iroha_ledger",
-  "java_class_path":"java_tests",
-  "java_class_path_local":"smart_contract/java_tests",
-  "java_library_path":"lib",
-  "java_library_path_local":"build/lib",
-  "java_policy_path":"jvm/java.policy.txt",
-  "concurrency": 0,
-  "max_faulty_peers" : 1,
-  "pool_worker_queue_size": 1024,
-  "http_port": 1204,
-  "grpc_port": 50051,
-  "active_start": false
-}
+{"database_path":"/tmp/iroha_ledger","java_class_path":"java_tests","java_class_path_local":"smart_contract/java_tests","java_library_path":"lib","java_library_path_local":"build/lib","java_policy_path":"jvm/java.policy.txt","concurrency": 0,"max_faulty_peers" : 1,"pool_worker_queue_size": 1024,"http_port": 1204,"grpc_port": 50051,"active_start": false}
diff --git a/config/sumeragi.json b/config/sumeragi.json
@@ -1 +1,2 @@
-{"group":[{"ip":"188.130.155.34","name":"bogdan","publicKey":"IaDYg2mKk2u1JQcKw5PL4qgdDKVKyj+l74rvu7xrS1k="}],"me":{"ip":"188.130.155.34","name":"bogdan","privateKey":"IBUs5nbuyJDC3VPG6Dtp+knMRDnUwNgztkNc5dZH0Uk12OVNbGRxanDRBcXwuFyMSAwFx2pjH8L0QWuQHRTEDg==","publicKey":"IaDYg2mKk2u1JQcKw5PL4qgdDKVKyj+l74rvu7xrS1k="}}
+{"group" : [{"ip" : "172.17.0.2","name" : "toyama","publicKey" : "IaDYg2mKk2u1JQcKw5PL4qgdDKVKyj+l74rvu7xrS1k="},{"ip" : "172.17.0.3","name" : "iorin","publicKey" : "IaDYg2mKk2u1JQcKw5PL4qgdDKVKyj+l74rvu7xrS1k="},{"ip" : "172.17.0.5","name" : "nao","publicKey" : "IaDYg2mKk2u1JQcKw5PL4qgdDKVKyj+l74rvu7xrS1k="},{"ip" : "172.17.0.6","name" : "karin","publicKey" : "IaDYg2mKk2u1JQcKw5PL4qgdDKVKyj+l74rvu7xrS1k="}],
+  "me" : {  "ip":"172.17.0.2","name":"toyama","privateKey":"IBUs5nbuyJDC3VPG6Dtp+knMRDnUwNgztkNc5dZH0Uk12OVNbGRxanDRBcXwuFyMSAwFx2pjH8L0QWuQHRTEDg==","publicKey":"IaDYg2mKk2u1JQcKw5PL4qgdDKVKyj+l74rvu7xrS1k="}}
diff --git a/core/consensus/sumeragi.cpp b/core/consensus/sumeragi.cpp
@@ -273,10 +273,10 @@ void initializeSumeragi() {
 
         std::vector<flatbuffers::Offset<Signature>> tx_signatures;
 
-        if(transaction->signatures() != nullptr) {
+        if (transaction->signatures() != nullptr) {
             for (auto &&txSig : *transaction->signatures()) {
                 std::vector<uint8_t> _data;
-                if(txSig->signature() != nullptr) {
+                if (txSig->signature() != nullptr) {
                     for (auto d : *txSig->signature()) {
                         _data.emplace_back(d);
                     }