Merge pull request #34 from ManfredKarrer/merged-voting

Add DAO code
bisq-network · Aug 15, 2018 · 2881cfe · 2881cfe
2 parents c02e2ad + 88bb79c
commit 2881cfe
Show file tree

Hide file tree

Showing 7 changed files with 355 additions and 225 deletions.
diff --git a/src/main/java/bisq/common/app/Version.java b/src/main/java/bisq/common/app/Version.java
@@ -118,8 +118,9 @@ public static void printVersion() {
                 '}');
     }
 
-    public static final byte COMPENSATION_REQUEST_VERSION = (byte) 0x01;
+    public static final byte COMPENSATION_REQUEST = (byte) 0x01;
     public static final byte PROPOSAL = (byte) 0x01;
-    public static final byte BLIND_VOTE_VERSION = (byte) 0x01;
-    public static final byte VOTE_REVEAL_VERSION = (byte) 0x01;
+    public static final byte BLIND_VOTE = (byte) 0x01;
+    public static final byte VOTE_REVEAL = (byte) 0x01;
+    public static final byte LOCKUP = (byte) 0x01;
 }
diff --git a/src/main/java/bisq/common/proto/ProtoUtil.java b/src/main/java/bisq/common/proto/ProtoUtil.java
@@ -64,11 +64,11 @@ public static byte[] byteArrayOrNullFromProto(ByteString proto) {
      * @param <E>      the enum Type
      * @return an enum
      */
+    @Nullable
     public static <E extends Enum<E>> E enumFromProto(Class<E> enumType, String name) {
         E result = Enums.getIfPresent(enumType, name).orNull();
-        if (result == null) {
+        if (result == null)
             log.error("Invalid value for enum " + enumType.getSimpleName() + ": " + name);
-        }
 
         return result;
     }

diff --git a/src/main/java/bisq/common/proto/persistable/PersistableList.java b/src/main/java/bisq/common/proto/persistable/PersistableList.java
@@ -25,10 +25,12 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Delegate;
 
+@EqualsAndHashCode
 public class PersistableList<T extends PersistablePayload> implements PersistableEnvelope, Iterable<T> {
     @Delegate(excludes = ExcludesDelegateMethods.class)
     @Getter

diff --git a/src/main/java/bisq/common/storage/Storage.java b/src/main/java/bisq/common/storage/Storage.java
@@ -17,6 +17,7 @@
 
 package bisq.common.storage;
 
+import bisq.common.app.DevEnv;
 import bisq.common.proto.persistable.PersistableEnvelope;
 import bisq.common.proto.persistable.PersistenceProtoResolver;
 
@@ -165,6 +166,7 @@ private T getPersisted() {
                 try {
                     // We keep a backup which might be used for recovery
                     fileManager.removeAndBackupFile(fileName);
+                    DevEnv.logErrorAndThrowIfDevMode(t.toString());
                 } catch (IOException e1) {
                     e1.printStackTrace();
                     log.error(e1.getMessage());

diff --git a/src/main/java/bisq/common/util/Utilities.java b/src/main/java/bisq/common/util/Utilities.java
@@ -601,4 +601,21 @@ public static boolean isRestrictedCryptography() {
         return name != null && name.equals("Java(TM) SE Runtime Environment")
                 && ver != null && (ver.startsWith("1.7") || ver.startsWith("1.8"));
     }
+
+    public static byte[] integerToByteArray(int intValue, int numBytes) {
+        byte[] bytes = new byte[numBytes];
+        for (int i = numBytes - 1; i >= 0; i--) {
+            bytes[i] = ((byte) (intValue & 0xFF));
+            intValue >>>= 8;
+        }
+        return bytes;
+    }
+
+    public static int byteArrayToInteger(byte[] bytes) {
+        int result = 0;
+        for (byte aByte : bytes) {
+            result = result << 8 | aByte & 0xff;
+        }
+        return result;
+    }
 }