Move to latest cava build

cryptocurrent · Nov 27, 2018 · f28d667 · f28d667
1 parent 54223c2
commit f28d667
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -206,7 +206,7 @@ repositories {
 
 dependencies {
   // cava
-  compile 'net.consensys.cava:cava:0.2.0'
+  compile 'net.consensys.cava:cava:0.5.0'
 
   // vertx
   compile 'io.vertx:vertx-core:3.5.2'

diff --git a/src/main/java/net/consensys/orion/cmd/Orion.java b/src/main/java/net/consensys/orion/cmd/Orion.java
@@ -441,13 +441,13 @@ private KeyValueStore createStorage(String storage, Path storagePath) {
     Path dbPath = storagePath.resolve(db);
     if (storage.toLowerCase().startsWith("mapdb")) {
       try {
-        return new MapDBKeyValueStore(dbPath);
+        return MapDBKeyValueStore.open(dbPath);
       } catch (IOException e) {
         throw new OrionStartException("Couldn't create MapDB store: " + dbPath, e);
       }
     } else if (storage.toLowerCase().startsWith("leveldb")) {
       try {
-        return new LevelDBKeyValueStore(dbPath);
+        return LevelDBKeyValueStore.open(dbPath);
       } catch (IOException e) {
         throw new OrionStartException("Couldn't create LevelDB store: " + dbPath, e);
       }

diff --git a/src/main/java/net/consensys/orion/storage/EncryptedPayloadStorage.java b/src/main/java/net/consensys/orion/storage/EncryptedPayloadStorage.java
@@ -52,7 +52,7 @@ public String generateDigest(EncryptedPayload data) {
   public AsyncResult<Optional<EncryptedPayload>> get(String key) {
     Bytes keyBytes = Bytes.wrap(key.getBytes(UTF_8));
     return store.getAsync(keyBytes).thenApply(
-        maybeBytes -> maybeBytes
-            .map(bytes -> Serializer.deserialize(HttpContentType.CBOR, EncryptedPayload.class, bytes.toArrayUnsafe())));
+        maybeBytes -> Optional.ofNullable(maybeBytes).map(
+            bytes -> Serializer.deserialize(HttpContentType.CBOR, EncryptedPayload.class, bytes.toArrayUnsafe())));
   }
 }
diff --git a/src/test/java/net/consensys/orion/http/handler/HandlerTest.java b/src/test/java/net/consensys/orion/http/handler/HandlerTest.java
@@ -90,7 +90,7 @@ void setUp(@TempDirectory Path tempDir) throws Exception {
     enclave = buildEnclave(tempDir);
 
     Path path = tempDir.resolve("routerdb");
-    storage = new MapDBKeyValueStore(path);
+    storage = MapDBKeyValueStore.open(path);
     // create our vertx object
     vertx = Vertx.vertx();
     StorageKeyBuilder keyBuilder = new Sha512_256StorageKeyBuilder();