Skip to content

Commit 211df96

Browse files
eu321Warchant
authored andcommittedJan 13, 2020
mock-pop-mining: get rid of package-private members
1 parent cd2d47c commit 211df96

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed
 

‎mock-pop-mining/src/main/java/org/veriblock/sdk/mock/AltChainPopMiner.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public VeriBlockBlockchain getVeriBlockBlockchain() {
4444
}
4545

4646
// retrieve the blocks between lastKnownBlock and getChainHead()
47-
List<VeriBlockBlock> createVeriBlockContext(VeriBlockBlock lastKnownBlock) throws SQLException {
47+
private List<VeriBlockBlock> createVeriBlockContext(VeriBlockBlock lastKnownBlock) throws SQLException {
4848
List<VeriBlockBlock> context = new ArrayList<>();
4949

5050
VeriBlockBlock prevBlock = veriblockBlockchain.get(veriblockBlockchain.getChainHead().getPreviousBlock());
@@ -84,7 +84,7 @@ private Address deriveAddress(PublicKey key) {
8484
return new Address(data + checksum);
8585
}
8686

87-
AltPublication mine(PublicationData publicationData, VeriBlockBlock lastKnownVBKBlock, KeyPair key) throws SQLException, SignatureException, InvalidKeyException, NoSuchAlgorithmException {
87+
public AltPublication mine(PublicationData publicationData, VeriBlockBlock lastKnownVBKBlock, KeyPair key) throws SQLException, SignatureException, InvalidKeyException, NoSuchAlgorithmException {
8888

8989
Address address = deriveAddress(key.getPublic());
9090

‎mock-pop-mining/src/main/java/org/veriblock/sdk/mock/BitcoinBlockchain.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
public class BitcoinBlockchain extends org.veriblock.sdk.blockchain.BitcoinBlockchain {
2525
private final Map<Sha256Hash, BitcoinBlockData> blockDataStore = new HashMap<>();
2626

27-
BitcoinBlockchain(BitcoinNetworkParameters networkParameters,
27+
public BitcoinBlockchain(BitcoinNetworkParameters networkParameters,
2828
BlockStore<StoredBitcoinBlock, Sha256Hash> store) {
2929
super(networkParameters, store);
3030
}

‎mock-pop-mining/src/main/java/org/veriblock/sdk/mock/VeriBlockBlockData.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ public Sha256Hash getSubject(int index) {
7777
}
7878
}
7979

80-
RegularSubtree txs = new RegularSubtree();
81-
PoPSubtree popTxs = new PoPSubtree();
80+
private RegularSubtree txs = new RegularSubtree();
81+
private PoPSubtree popTxs = new PoPSubtree();
8282

83-
byte[] blockContentMetapackage = new byte[0];
83+
private byte[] blockContentMetapackage = new byte[0];
8484

8585
public Sha256Hash getMerkleRoot() {
8686
return Sha256Hash.of(

‎mock-pop-mining/src/main/java/org/veriblock/sdk/mock/VeriBlockBlockchain.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class VeriBlockBlockchain extends org.veriblock.sdk.blockchain.VeriBlockB
3030
private final Map<VBlakeHash, VeriBlockBlockData> blockDataStore = new HashMap<>();
3131
private final BlockStore<StoredVeriBlockBlock, VBlakeHash> store;
3232

33-
VeriBlockBlockchain(VeriBlockNetworkParameters networkParameters,
33+
public VeriBlockBlockchain(VeriBlockNetworkParameters networkParameters,
3434
BlockStore<StoredVeriBlockBlock, VBlakeHash> store,
3535
BlockStore<StoredBitcoinBlock, Sha256Hash> bitcoinStore) {
3636
super(networkParameters, store, bitcoinStore);

‎mock-pop-mining/src/main/java/org/veriblock/sdk/mock/VeriBlockPopMiner.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ private byte[] createPublicationData(VeriBlockBlock publishedBlock, Address addr
6161
return payoutInfo;
6262
}
6363

64-
BitcoinTransaction createBitcoinTx(VeriBlockBlock publishedBlock, Address address) {
64+
private BitcoinTransaction createBitcoinTx(VeriBlockBlock publishedBlock, Address address) {
6565
byte[] publicationData = createPublicationData(publishedBlock, address);
6666
return new BitcoinTransaction(publicationData);
6767
}
6868

6969
// retrieve the blocks between lastKnownBlock and getChainHead()
70-
List<BitcoinBlock> createBitcoinContext(BitcoinBlock lastKnownBlock) throws SQLException {
70+
private List<BitcoinBlock> createBitcoinContext(BitcoinBlock lastKnownBlock) throws SQLException {
7171
List<BitcoinBlock> context = new ArrayList<>();
7272

7373
BitcoinBlock prevBlock = bitcoinBlockchain.get(bitcoinBlockchain.getChainHead().getPreviousBlock());
@@ -81,7 +81,7 @@ List<BitcoinBlock> createBitcoinContext(BitcoinBlock lastKnownBlock) throws SQLE
8181
}
8282

8383
// retrieve the blocks between lastKnownBlock and getChainHead()
84-
List<VeriBlockBlock> createVeriBlockContext(VeriBlockBlock lastKnownBlock) throws SQLException {
84+
private List<VeriBlockBlock> createVeriBlockContext(VeriBlockBlock lastKnownBlock) throws SQLException {
8585
List<VeriBlockBlock> context = new ArrayList<>();
8686

8787
VeriBlockBlock prevBlock = veriblockBlockchain.get(veriblockBlockchain.getChainHead().getPreviousBlock());
@@ -94,7 +94,7 @@ List<VeriBlockBlock> createVeriBlockContext(VeriBlockBlock lastKnownBlock) throw
9494
return context;
9595
}
9696

97-
Address deriveAddress(PublicKey key) {
97+
private Address deriveAddress(PublicKey key) {
9898
String data = "V" + Base58.encode(Sha256Hash.of(key.getEncoded()).getBytes()).substring(0, 24);
9999

100100
Sha256Hash hash = Sha256Hash.of(data.getBytes(StandardCharsets.UTF_8));
@@ -104,7 +104,7 @@ Address deriveAddress(PublicKey key) {
104104

105105
}
106106

107-
VeriBlockPoPTransaction signTransaction(VeriBlockPoPTransaction tx, PrivateKey privateKey) throws SignatureException, InvalidKeyException, NoSuchAlgorithmException {
107+
private VeriBlockPoPTransaction signTransaction(VeriBlockPoPTransaction tx, PrivateKey privateKey) throws SignatureException, InvalidKeyException, NoSuchAlgorithmException {
108108
byte[] signature = Utils.signMessageWithPrivateKey(SerializeDeserializeService.getId(tx).getBytes(),
109109
privateKey);
110110

0 commit comments

Comments
 (0)
Please sign in to comment.