Close Private Storage Provider (#1059)

ethereum/core/src/main/java/tech/pegasys/pantheon/ethereum/core/PrivacyParameters.java

@@ -38,6 +38,7 @@ public class PrivacyParameters {
   private String publicKey;
   private File publicKeyFile;
   private WorldStateArchive privateWorldStateArchive;
+  private StorageProvider privateStorageProvider;
 
   public String getPublicKey() {
     return publicKey;
@@ -91,7 +92,7 @@ public void setPrivacyAddress(final Integer privacyAddress) {
 
   public void enablePrivateDB(final Path path) throws IOException {
     final Path privateDbPath = path.resolve(PRIVATE_DATABASE_PATH);
-    final StorageProvider privateStorageProvider =
+    this.privateStorageProvider =
         RocksDbStorageProvider.create(privateDbPath, new NoOpMetricsSystem());
     final WorldStateStorage privateWorldStateStorage =
         privateStorageProvider.createWorldStateStorage();
@@ -101,4 +102,8 @@ public void enablePrivateDB(final Path path) throws IOException {
   public WorldStateArchive getPrivateWorldStateArchive() {
     return privateWorldStateArchive;
   }
+
+  public StorageProvider getPrivateStorageProvider() {
+    return this.privateStorageProvider;
+  }
 }

pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonController.java

@@ -190,6 +190,9 @@ public static PantheonController<Void> init(
           }
           try {
             storageProvider.close();
+            if (privacyParameters.getPrivateStorageProvider() != null) {
+              privacyParameters.getPrivateStorageProvider().close();
+            }
           } catch (final IOException e) {
             LOG.error("Failed to close storage provider", e);
           }