Merge pull request #15 from ManfredKarrer/voting

Change IntegerVoteResult to LongVoteResult

src/main/java/bisq/common/app/DevEnv.java

@@ -17,6 +17,9 @@
 
 package bisq.common.app;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class DevEnv {
     // Was used for P2P network stress test to adjust several setting for the tests (e.g. use lower btc fees for offers,..)
     public static final boolean STRESS_TEST_MODE = false;
@@ -44,4 +47,10 @@ public static void setDevMode(boolean devMode) {
 
     public static final boolean DAO_PHASE2_ACTIVATED = false;
     public static final boolean DAO_TRADING_ACTIVATED = false;
+
+    public static void logErrorAndThrowIfDevMode(String msg) {
+        log.error(msg);
+        if (devMode)
+            throw new RuntimeException(msg);
+    }
 }

src/main/proto/pb.proto

@@ -1366,15 +1366,14 @@ message ProposalPayload {
     string title = 5;
     string description = 6;
     string link = 7;
-    string node_address = 8;
-    bytes owner_pub_key_encoded = 9;
-    string tx_id = 10;
-    map<string, string> extra_data = 11;
+    bytes owner_pub_key_encoded = 8;
+    string tx_id = 9;
+    map<string, string> extra_data = 10;
     oneof message {
-        CompensationRequestPayload compensation_request_payload = 12;
-        GenericProposalPayload generic_proposal_payload = 13;
-        ChangeParamProposalPayload change_param_proposal_payload = 14;
-        RemoveAltcoinProposalPayload remove_altcoin_proposal_payload = 15;
+        CompensationRequestPayload compensation_request_payload = 11;
+        GenericProposalPayload generic_proposal_payload = 12;
+        ChangeParamProposalPayload change_param_proposal_payload = 13;
+        RemoveAltcoinProposalPayload remove_altcoin_proposal_payload = 14;
     }
 }
 
@@ -1442,16 +1441,16 @@ message RemoveAltcoinProposal {
 message VoteResult {
     oneof message {
         BooleanVoteResult boolean_vote_result = 1;
-        IntegerVoteResult integer_vote_result = 2;
+        LongVoteResult long_vote_result = 2;
     }
 }
 
 message BooleanVoteResult {
     bool accepted = 1;
 }
 
-message IntegerVoteResult {
-    uint32 value = 1;
+message LongVoteResult {
+    uint64 value = 1;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////