implement protocol v2

This commit is contained in:
woodser 2021-08-22 16:21:56 -04:00
parent 65bcd47446
commit 86f7d090b6
185 changed files with 5117 additions and 4010 deletions

View file

@ -195,6 +195,8 @@ public class AccountAgeWitnessServiceTest {
"contractAsJson",
null,
null,
sellerPaymentAccountPayload,
buyerPaymentAccountPayload,
null,
true,
SupportType.ARBITRATION));
@ -230,9 +232,10 @@ public class AccountAgeWitnessServiceTest {
when(contract.getTradeAmount()).thenReturn(Coin.parseCoin("0.01"));
when(contract.getBuyerPubKeyRing()).thenReturn(buyerPubKeyRing);
when(contract.getSellerPubKeyRing()).thenReturn(sellerPubKeyRing);
when(contract.getBuyerPaymentAccountPayload()).thenReturn(buyerPaymentAccountPayload);
when(contract.getSellerPaymentAccountPayload()).thenReturn(sellerPaymentAccountPayload);
when(contract.getOfferPayload()).thenReturn(mock(OfferPayload.class));
when(contract.isBuyerMakerAndSellerTaker()).thenReturn(false);
assertEquals(disputes.get(0).getBuyerPaymentAccountPayload(), buyerPaymentAccountPayload);
assertEquals(disputes.get(0).getSellerPaymentAccountPayload(), sellerPaymentAccountPayload);
List<TraderDataItem> items = service.getTraderPaymentAccounts(now, getPaymentMethodById(PaymentMethod.SEPA_ID), disputes);
assertEquals(2, items.size());

View file

@ -48,8 +48,6 @@ public class OfferMaker {
lookup.valueOf(minAmount, 100000L),
lookup.valueOf(baseCurrencyCode, "XMR"),
lookup.valueOf(counterCurrencyCode, "USD"),
null,
null,
"SEPA",
"",
null,
@ -73,7 +71,9 @@ public class OfferMaker {
false,
null,
null,
0));
0,
null,
null));
public static final Maker<Offer> btcUsdOffer = a(Offer);
}

View file

@ -27,6 +27,7 @@ import static org.mockito.Mockito.*;
public class OpenOfferManagerTest {
private PersistenceManager<TradableList<OpenOffer>> persistenceManager;
private PersistenceManager<SignedOfferList> signedOfferPersistenceManager;
private CoreContext coreContext;
@Before
@ -34,12 +35,14 @@ public class OpenOfferManagerTest {
var corruptedStorageFileHandler = mock(CorruptedStorageFileHandler.class);
var storageDir = Files.createTempDirectory("storage").toFile();
persistenceManager = new PersistenceManager<>(storageDir, null, corruptedStorageFileHandler);
signedOfferPersistenceManager = new PersistenceManager<>(storageDir, null, corruptedStorageFileHandler);
coreContext = new CoreContext();
}
@After
public void tearDown() {
persistenceManager.shutdown();
signedOfferPersistenceManager.shutdown();
}
@Test
@ -69,7 +72,8 @@ public class OpenOfferManagerTest {
null,
null,
null,
persistenceManager);
persistenceManager,
signedOfferPersistenceManager);
AtomicBoolean startEditOfferSuccessful = new AtomicBoolean(false);
@ -117,7 +121,8 @@ public class OpenOfferManagerTest {
null,
null,
null,
persistenceManager);
persistenceManager,
signedOfferPersistenceManager);
AtomicBoolean startEditOfferSuccessful = new AtomicBoolean(false);
@ -158,7 +163,8 @@ public class OpenOfferManagerTest {
null,
null,
null,
persistenceManager);
persistenceManager,
signedOfferPersistenceManager);
AtomicBoolean startEditOfferSuccessful = new AtomicBoolean(false);