mirror of
https://github.com/bisq-network/bisq.git
synced 2025-02-23 23:06:39 +01:00
restore the test that was lost in a rebase of my test branch
This commit is contained in:
Christoph Sturm
parent
62c57cbab7
commit
2383d7ea50
1 changed files with 12 additions and 205 deletions
|
|
@ -1,221 +1,28 @@
|
||||||
/*
|
|
||||||
* This file is part of Bisq.
|
|
||||||
*
|
|
||||||
* Bisq is free software: you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or (at
|
|
||||||
* your option) any later version.
|
|
||||||
*
|
|
||||||
* Bisq is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
|
|
||||||
* License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package bisq.network.p2p.storage;
|
package bisq.network.p2p.storage;
|
||||||
|
|
||||||
import bisq.network.crypto.EncryptionService;
|
|
||||||
import bisq.network.p2p.NodeAddress;
|
|
||||||
import bisq.network.p2p.TestUtils;
|
|
||||||
import bisq.network.p2p.network.NetworkNode;
|
import bisq.network.p2p.network.NetworkNode;
|
||||||
import bisq.network.p2p.peers.Broadcaster;
|
import bisq.network.p2p.peers.Broadcaster;
|
||||||
import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
|
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
|
||||||
|
import bisq.network.p2p.storage.persistence.ProtectedDataStoreService;
|
||||||
|
import bisq.network.p2p.storage.persistence.ResourceDataStoreService;
|
||||||
|
|
||||||
import bisq.common.crypto.CryptoException;
|
import bisq.common.storage.Storage;
|
||||||
import bisq.common.crypto.KeyRing;
|
|
||||||
import bisq.common.crypto.KeyStorage;
|
|
||||||
import bisq.common.proto.network.NetworkProtoResolver;
|
|
||||||
import bisq.common.proto.persistable.PersistenceProtoResolver;
|
|
||||||
import bisq.common.storage.FileUtil;
|
|
||||||
|
|
||||||
import java.security.InvalidKeyException;
|
import java.time.Clock;
|
||||||
import java.security.KeyPair;
|
|
||||||
import java.security.KeyStoreException;
|
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
import java.security.SignatureException;
|
|
||||||
import java.security.cert.CertificateException;
|
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import org.junit.Test;
|
||||||
import java.nio.file.Paths;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import org.junit.After;
|
|
||||||
import org.junit.Before;
|
|
||||||
|
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
|
|
||||||
public class P2PDataStorageTest {
|
public class P2PDataStorageTest {
|
||||||
private final Set<NodeAddress> seedNodes = new HashSet<>();
|
|
||||||
private EncryptionService encryptionService1, encryptionService2;
|
|
||||||
private P2PDataStorage dataStorage1;
|
|
||||||
private KeyPair storageSignatureKeyPair1, storageSignatureKeyPair2;
|
|
||||||
private KeyRing keyRing1, keyRing2;
|
|
||||||
private ProtectedStoragePayload protectedStoragePayload;
|
|
||||||
private File dir1;
|
|
||||||
private File dir2;
|
|
||||||
|
|
||||||
Broadcaster broadcaster = mock(Broadcaster.class);
|
|
||||||
NetworkNode networkNode = mock(NetworkNode.class);
|
|
||||||
NetworkProtoResolver networkProtoResolver = mock(NetworkProtoResolver.class);
|
|
||||||
PersistenceProtoResolver persistenceProtoResolver = mock(PersistenceProtoResolver.class);
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setup() throws InterruptedException, NoSuchAlgorithmException, CertificateException, KeyStoreException, IOException, CryptoException, SignatureException, InvalidKeyException {
|
|
||||||
|
|
||||||
dir1 = File.createTempFile("temp_tests1", "");
|
|
||||||
//noinspection ResultOfMethodCallIgnored
|
|
||||||
dir1.delete();
|
|
||||||
//noinspection ResultOfMethodCallIgnored
|
|
||||||
dir1.mkdir();
|
|
||||||
dir2 = File.createTempFile("temp_tests2", "");
|
|
||||||
//noinspection ResultOfMethodCallIgnored
|
|
||||||
dir2.delete();
|
|
||||||
//noinspection ResultOfMethodCallIgnored
|
|
||||||
dir2.mkdir();
|
|
||||||
|
|
||||||
keyRing1 = new KeyRing(new KeyStorage(dir1));
|
|
||||||
storageSignatureKeyPair1 = keyRing1.getSignatureKeyPair();
|
|
||||||
encryptionService1 = new EncryptionService(keyRing1, TestUtils.getNetworkProtoResolver());
|
|
||||||
|
|
||||||
// for mailbox
|
|
||||||
keyRing2 = new KeyRing(new KeyStorage(dir2));
|
|
||||||
storageSignatureKeyPair2 = keyRing2.getSignatureKeyPair();
|
|
||||||
encryptionService2 = new EncryptionService(keyRing2, TestUtils.getNetworkProtoResolver());
|
|
||||||
//dataStorage1 = new P2PDataStorage(broadcaster, networkNode, dir1, persistenceProtoResolver);
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
public void tearDown() throws InterruptedException, NoSuchAlgorithmException, CertificateException, KeyStoreException, IOException, CryptoException, SignatureException, InvalidKeyException {
|
|
||||||
Path path = Paths.get(TestUtils.test_dummy_dir);
|
|
||||||
File dir = path.toFile();
|
|
||||||
FileUtil.deleteDirectory(dir);
|
|
||||||
FileUtil.deleteDirectory(dir1);
|
|
||||||
FileUtil.deleteDirectory(dir2);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* @Test
|
|
||||||
public void testProtectedStorageEntryAddAndRemove() throws InterruptedException, NoSuchAlgorithmException, CertificateException, KeyStoreException, IOException, CryptoException, SignatureException, InvalidKeyException, NoSuchProviderException {
|
|
||||||
storagePayload = new AlertPayload(new AlertVO("alert",
|
|
||||||
false,
|
|
||||||
"version",
|
|
||||||
storageSignatureKeyPair1.getPublic().getEncoded(),
|
|
||||||
"sig",
|
|
||||||
null));
|
|
||||||
|
|
||||||
ProtectedStorageEntry data = dataStorage1.getProtectedData(storagePayload, storageSignatureKeyPair1);
|
|
||||||
assertTrue(dataStorage1.add(data, null, null, true));
|
|
||||||
assertEquals(1, dataStorage1.getMap().size());
|
|
||||||
|
|
||||||
int newSequenceNumber = data.sequenceNumber + 1;
|
|
||||||
byte[] hashOfDataAndSeqNr = Hash.getHash(new P2PDataStorage.DataAndSeqNrPair(data.getStoragePayload(), newSequenceNumber));
|
|
||||||
byte[] signature = Sig.sign(storageSignatureKeyPair1.getPrivate(), hashOfDataAndSeqNr);
|
|
||||||
ProtectedStorageEntry dataToRemove = new ProtectedStorageEntry(data.getStoragePayload(), data.ownerPubKey, newSequenceNumber, signature);
|
|
||||||
assertTrue(dataStorage1.remove(dataToRemove, null, true));
|
|
||||||
assertEquals(0, dataStorage1.getMap().size());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testProtectedStorageEntryRoundtrip() throws InterruptedException, NoSuchAlgorithmException, CertificateException, KeyStoreException, IOException, CryptoException, SignatureException, InvalidKeyException, NoSuchProviderException {
|
public void canStart1Instance() {
|
||||||
//mockData = new MockData("mockData", keyRing1.getSignatureKeyPair().getPublic());
|
P2PDataStorage storage = new P2PDataStorage(mock(NetworkNode.class),
|
||||||
storagePayload = getDummyOffer();
|
mock(Broadcaster.class),
|
||||||
|
mock(AppendOnlyDataStoreService.class),
|
||||||
|
mock(ProtectedDataStoreService.class), mock(ResourceDataStoreService.class),
|
||||||
|
mock(Storage.class), Clock.systemUTC());
|
||||||
|
|
||||||
ProtectedStorageEntry data = dataStorage1.getProtectedData(storagePayload, storageSignatureKeyPair1);
|
|
||||||
setSignature(data);
|
|
||||||
assertTrue(checkSignature(data));
|
|
||||||
|
|
||||||
ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
|
|
||||||
data.toEnvelopeProto().writeTo(byteOutputStream);
|
|
||||||
|
|
||||||
//TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in io.bisq.common.
|
|
||||||
ProtectedStorageEntry protectedStorageEntry = ProtoBufferUtilities.getProtectedStorageEntry(PB.ProtectedStorageEntry.parseFrom(new ByteArrayInputStream(byteOutputStream.toByteArray())));
|
|
||||||
|
|
||||||
assertTrue(Arrays.equals(Hash.getHash(data.getStoragePayload()), Hash.getHash(protectedStorageEntry.getStoragePayload())));
|
|
||||||
assertTrue(data.equals(protectedStorageEntry));
|
|
||||||
assertTrue(checkSignature(protectedStorageEntry));
|
|
||||||
}*/
|
|
||||||
|
|
||||||
//TODO Use NetworkProtoResolver, PersistenceProtoResolver or ProtoResolver which are all in io.bisq.common.
|
|
||||||
/* @Test
|
|
||||||
public void testOfferRoundtrip() throws InvalidProtocolBufferException {
|
|
||||||
OfferPayload offer = getDummyOffer();
|
|
||||||
try {
|
|
||||||
String buffer = JsonFormat.printer().print(offer.toEnvelopeProto().getOfferPayload());
|
|
||||||
JsonFormat.Parser parser = JsonFormat.parser();
|
|
||||||
PB.OfferPayload.Builder builder = PB.OfferPayload.newBuilder();
|
|
||||||
parser.merge(buffer, builder);
|
|
||||||
assertEquals(offer, ProtoBufferUtilities.getOfferPayload(builder.build()));
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
fail();
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
/* @NotNull
|
|
||||||
private OfferPayload getDummyOffer() {
|
|
||||||
NodeAddress nodeAddress = new NodeAddress("host", 1000);
|
|
||||||
NodeAddress nodeAddress2 = new NodeAddress("host1", 1001);
|
|
||||||
NodeAddress nodeAddress3 = new NodeAddress("host2", 1002);
|
|
||||||
NodeAddress nodeAddress4 = new NodeAddress("host3", 1002);
|
|
||||||
return new OfferPayload("id",
|
|
||||||
System.currentTimeMillis(),
|
|
||||||
nodeAddress4,
|
|
||||||
keyRing1.getPubKeyRing(),
|
|
||||||
OfferPayload.Direction.BUY,
|
|
||||||
1200,
|
|
||||||
1.5,
|
|
||||||
true,
|
|
||||||
100,
|
|
||||||
50,
|
|
||||||
"BTC",
|
|
||||||
"USD",
|
|
||||||
Lists.newArrayList(nodeAddress,
|
|
||||||
nodeAddress2,
|
|
||||||
nodeAddress3),
|
|
||||||
Lists.newArrayList(nodeAddress,
|
|
||||||
nodeAddress2,
|
|
||||||
nodeAddress3),
|
|
||||||
"SEPA",
|
|
||||||
"accountid",
|
|
||||||
"feetxId",
|
|
||||||
"BE",
|
|
||||||
Lists.newArrayList("BE", "AU"),
|
|
||||||
"bankid",
|
|
||||||
Lists.newArrayList("BANK1", "BANK2"),
|
|
||||||
"version",
|
|
||||||
100,
|
|
||||||
100,
|
|
||||||
100,
|
|
||||||
100,
|
|
||||||
1000,
|
|
||||||
1000,
|
|
||||||
1000,
|
|
||||||
false,
|
|
||||||
false,
|
|
||||||
|
|
||||||
1000,
|
|
||||||
1000,
|
|
||||||
false,
|
|
||||||
"hash",
|
|
||||||
null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setSignature(ProtectedStorageEntry entry) throws CryptoException {
|
|
||||||
int newSequenceNumber = entry.sequenceNumber;
|
|
||||||
byte[] hashOfDataAndSeqNr = Hash.getHash(new P2PDataStorage.DataAndSeqNrPair(entry.getStoragePayload(), newSequenceNumber));
|
|
||||||
byte[] signature = Sig.sign(storageSignatureKeyPair1.getPrivate(), hashOfDataAndSeqNr);
|
|
||||||
entry.signature = signature;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean checkSignature(ProtectedStorageEntry entry) throws CryptoException {
|
|
||||||
byte[] hashOfDataAndSeqNr = Hash.getHash(new P2PDataStorage.DataAndSeqNrPair(entry.getStoragePayload(), entry.sequenceNumber));
|
|
||||||
return dataStorage1.checkSignature(entry.ownerPubKey, hashOfDataAndSeqNr, entry.signature);
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue