From 8fe1d84a5980cc288520716a9acebf21e88ab59a Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Wed, 3 May 2023 12:49:51 +0200
Subject: [PATCH] SPVBlockStore: make method `initNewStore()` take
 `genesisBlock`

This makes the method independent of `NetworkParameters`.
---
 core/src/main/java/org/bitcoinj/store/SPVBlockStore.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
index 3e2a81ba3..7e01efbe0 100644
--- a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
@@ -159,7 +159,7 @@ public class SPVBlockStore implements BlockStore {
                 if (!new String(header, StandardCharsets.US_ASCII).equals(HEADER_MAGIC))
                     throw new BlockStoreException("Header bytes do not equal " + HEADER_MAGIC);
             } else {
-                initNewStore(params);
+                initNewStore(params.getGenesisBlock());
             }
         } catch (Exception e) {
             try {
@@ -171,7 +171,7 @@ public class SPVBlockStore implements BlockStore {
         }
     }
 
-    private void initNewStore(NetworkParameters params) throws Exception {
+    private void initNewStore(Block genesisBlock) throws Exception {
         byte[] header;
         header = HEADER_MAGIC.getBytes(StandardCharsets.US_ASCII);
         buffer.put(header);
@@ -182,8 +182,7 @@ public class SPVBlockStore implements BlockStore {
         } finally {
             lock.unlock();
         }
-        Block genesis = params.getGenesisBlock().cloneAsHeader();
-        StoredBlock storedGenesis = new StoredBlock(genesis, genesis.getWork(), 0);
+        StoredBlock storedGenesis = new StoredBlock(genesisBlock.cloneAsHeader(), genesisBlock.getWork(), 0);
         put(storedGenesis);
         setChainHead(storedGenesis);
     }
@@ -350,7 +349,7 @@ public class SPVBlockStore implements BlockStore {
             }
             // Initialize store again
             ((Buffer) buffer).position(0);
-            initNewStore(params);
+            initNewStore(params.getGenesisBlock());
         } finally { lock.unlock(); }
     }
 }