mirror of
https://github.com/bisq-network/bisq.git
synced 2025-02-22 22:45:21 +01:00
Merge branch 'fix-parsertest' of https://github.com/sqrrm/exchange into sqrrm-fix-parsertest
# Conflicts: # core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
This commit is contained in:
Manfred Karrer
commit
42e712fce3
1 changed files with 55 additions and 32 deletions
|
|
@ -14,6 +14,7 @@ import io.bisq.core.dao.blockchain.vo.util.TxIdIndexTuple;
|
|||
import io.bisq.core.dao.node.consensus.BsqTxController;
|
||||
import io.bisq.core.dao.node.consensus.IssuanceController;
|
||||
import io.bisq.core.dao.node.consensus.OpReturnController;
|
||||
import io.bisq.core.dao.node.consensus.*;
|
||||
import io.bisq.core.dao.node.full.rpc.RpcService;
|
||||
import mockit.Expectations;
|
||||
import mockit.Injectable;
|
||||
|
|
@ -24,6 +25,7 @@ import org.junit.Ignore;
|
|||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import javax.inject.Named;
|
||||
import java.io.File;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -34,33 +36,49 @@ import static java.util.Arrays.asList;
|
|||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
// TODO seems the refactoring with read/write models has broken the unit test setup. @sqrmm Could you have a look?
|
||||
@Ignore
|
||||
// Intro to jmockit can be found at http://jmockit.github.io/tutorial/Mocking.html
|
||||
|
||||
@RunWith(JMockit.class)
|
||||
public class FullNodeParserTest {
|
||||
@Tested(availableDuringSetup = true)
|
||||
BsqBlockChainReadModel bsqBlockChainReadModel;
|
||||
// @Tested classes are instantiated automatically when needed in a test case,
|
||||
// using injection where possible, see http://jmockit.github.io/tutorial/Mocking.html#tested
|
||||
// To force instantiate earlier, use availableDuringSetup
|
||||
@Tested(fullyInitialized = true, availableDuringSetup = true)
|
||||
FullNodeParser fullNodeParser;
|
||||
|
||||
@Tested(fullyInitialized = true, availableDuringSetup = true)
|
||||
BsqTxController bsqTxController;
|
||||
BsqBlockChain bsqBlockChain;
|
||||
@Tested(availableDuringSetup = true)
|
||||
ReadModel readModel;
|
||||
|
||||
// Used by bsqTxVerification
|
||||
@Tested(fullyInitialized = true, availableDuringSetup = true)
|
||||
TxInputsVerification txInputsVerification;
|
||||
@Tested(fullyInitialized = true, availableDuringSetup = true)
|
||||
TxOutputsVerification txOutputsVerification;
|
||||
|
||||
// @Injectable are mocked resources used to for injecting into @Tested classes
|
||||
// The naming of these resources doesn't matter, any resource that fits will be used for injection
|
||||
|
||||
// Used by bsqBlockChain
|
||||
@Injectable
|
||||
PersistenceProtoResolver persistenceProtoResolver;
|
||||
@Injectable
|
||||
File storageDir;
|
||||
@Injectable
|
||||
String genesisId = "genesisId"; // TODO shouldn't it be genesisTxId
|
||||
String genesisTxId = "genesisTxId";
|
||||
@Injectable
|
||||
int genesisBlockHeight = 200;
|
||||
|
||||
// Used by fullNodeParser
|
||||
@Injectable
|
||||
RpcService rpcService;
|
||||
@Injectable
|
||||
OpReturnController opReturnController;
|
||||
@Injectable
|
||||
IssuanceController issuanceController;
|
||||
@Tested(fullyInitialized = true, availableDuringSetup = true)
|
||||
WriteModel writeModel;
|
||||
@Tested(fullyInitialized = true, availableDuringSetup = true)
|
||||
GenesisTxVerification genesisTxVerification;
|
||||
@Tested(fullyInitialized = true, availableDuringSetup = true)
|
||||
BsqTxVerification bsqTxVerification;
|
||||
|
||||
@Test
|
||||
public void testIsBsqTx() {
|
||||
|
|
@ -77,24 +95,29 @@ public class FullNodeParserTest {
|
|||
// 1) - null, 0 -> not BSQ transaction
|
||||
// 2) - 100, null -> BSQ transaction
|
||||
// 3) - 0, 100 -> BSQ transaction
|
||||
new Expectations(bsqBlockChainReadModel) {{
|
||||
bsqBlockChainReadModel.getSpendableTxOutput(new TxIdIndexTuple("tx1", 0));
|
||||
new Expectations(readModel) {{
|
||||
// Expectations can be recorded on mocked instances, either with specific matching arguments or catch all
|
||||
// http://jmockit.github.io/tutorial/Mocking.html#results
|
||||
// Results are returned in the order they're recorded, so in this case for the first call to
|
||||
// getSpendableTxOutput("tx1", 0) the return value will be Optional.empty()
|
||||
// for the second call the return is Optional.of(new TxOutput(0,... and so on
|
||||
readModel.getSpendableTxOutput(new TxIdIndexTuple("tx1", 0));
|
||||
result = Optional.empty();
|
||||
result = Optional.of(new TxOutput(0, 100, "txout1", null, null, null, height));
|
||||
result = Optional.of(new TxOutput(0, 0, "txout1", null, null, null, height));
|
||||
|
||||
bsqBlockChainReadModel.getSpendableTxOutput(new TxIdIndexTuple("tx1", 1));
|
||||
readModel.getSpendableTxOutput(new TxIdIndexTuple("tx1", 1));
|
||||
result = Optional.of(new TxOutput(0, 0, "txout2", null, null, null, height));
|
||||
result = Optional.empty();
|
||||
result = Optional.of(new TxOutput(0, 100, "txout2", null, null, null, height));
|
||||
}};
|
||||
|
||||
// First time there is no BSQ value to spend so it's not a bsq transaction
|
||||
assertFalse(bsqTxController.isBsqTx(height, tx));
|
||||
assertFalse(bsqTxVerification.isBsqTx(height, tx));
|
||||
// Second time there is BSQ in the first txout
|
||||
assertTrue(bsqTxController.isBsqTx(height, tx));
|
||||
assertTrue(bsqTxVerification.isBsqTx(height, tx));
|
||||
// Third time there is BSQ in the second txout
|
||||
assertTrue(bsqTxController.isBsqTx(height, tx));
|
||||
assertTrue(bsqTxVerification.isBsqTx(height, tx));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -125,10 +148,10 @@ public class FullNodeParserTest {
|
|||
Tx cbTx200 = new Tx(cbId200, 200, bh200, time,
|
||||
new ArrayList<TxInput>(),
|
||||
asList(new TxOutput(0, 25, cbId200, null, null, null, 200)));
|
||||
Tx genesisTx = new Tx(genesisId, 200, bh200, time,
|
||||
Tx genesisTx = new Tx(genesisTxId, 200, bh200, time,
|
||||
asList(new TxInput("someoldtx", 0)),
|
||||
asList(new TxOutput(0, issuance.getValue(), genesisId, null, null, null, 200)));
|
||||
Block block200 = new Block(bh200, 10, 10, 200, 2, "root", asList(cbId200, genesisId), time, Long.parseLong("1234"), "bits", BigDecimal.valueOf(1), "chainwork", bh199, bh201);
|
||||
asList(new TxOutput(0, issuance.getValue(), genesisTxId, null, null, null, 200)));
|
||||
Block block200 = new Block(bh200, 10, 10, 200, 2, "root", asList(cbId200, genesisTxId), time, Long.parseLong("1234"), "bits", BigDecimal.valueOf(1), "chainwork", bh199, bh201);
|
||||
|
||||
// Block 201
|
||||
// Make a bsq transaction
|
||||
|
|
@ -140,7 +163,7 @@ public class FullNodeParserTest {
|
|||
new ArrayList<TxInput>(),
|
||||
asList(new TxOutput(0, 25, cbId201, null, null, null, 201)));
|
||||
Tx bsqTx1 = new Tx(bsqTx1Id, 201, bh201, time,
|
||||
asList(new TxInput(genesisId, 0)),
|
||||
asList(new TxInput(genesisTxId, 0)),
|
||||
asList(new TxOutput(0, bsqTx1Value1, bsqTx1Id, null, null, null, 201),
|
||||
new TxOutput(1, bsqTx1Value2, bsqTx1Id, null, null, null, 201)));
|
||||
Block block201 = new Block(bh201, 10, 10, 201, 2, "root", asList(cbId201, bsqTx1Id), time, Long.parseLong("1234"), "bits", BigDecimal.valueOf(1), "chainwork", bh200, "nextBlockHash");
|
||||
|
|
@ -157,7 +180,7 @@ public class FullNodeParserTest {
|
|||
result = cbTx199;
|
||||
rpcService.requestTx(cbId200, genesisHeight);
|
||||
result = cbTx200;
|
||||
rpcService.requestTx(genesisId, genesisHeight);
|
||||
rpcService.requestTx(genesisTxId, genesisHeight);
|
||||
result = genesisTx;
|
||||
rpcService.requestTx(cbId201, 201);
|
||||
result = cbTx201;
|
||||
|
|
@ -170,25 +193,25 @@ public class FullNodeParserTest {
|
|||
});
|
||||
|
||||
// Verify that the genesis tx has been added to the bsq blockchain with the correct issuance amount
|
||||
assertTrue(bsqBlockChainReadModel.getGenesisTx() == genesisTx);
|
||||
assertTrue(bsqBlockChainReadModel.getIssuedAmount().getValue() == issuance.getValue());
|
||||
assertTrue(readModel.getGenesisTx() == genesisTx);
|
||||
assertTrue(readModel.getIssuedAmount().getValue() == issuance.getValue());
|
||||
|
||||
// And that other txs are not added
|
||||
assertFalse(bsqBlockChainReadModel.containsTx(cbId199));
|
||||
assertFalse(bsqBlockChainReadModel.containsTx(cbId200));
|
||||
assertFalse(bsqBlockChainReadModel.containsTx(cbId201));
|
||||
assertFalse(readModel.containsTx(cbId199));
|
||||
assertFalse(readModel.containsTx(cbId200));
|
||||
assertFalse(readModel.containsTx(cbId201));
|
||||
|
||||
// But bsq txs are added
|
||||
assertTrue(bsqBlockChainReadModel.containsTx(bsqTx1Id));
|
||||
TxOutput bsqOut1 = bsqBlockChainReadModel.getSpendableTxOutput(bsqTx1Id, 0).get();
|
||||
assertTrue(readModel.containsTx(bsqTx1Id));
|
||||
TxOutput bsqOut1 = readModel.getSpendableTxOutput(bsqTx1Id, 0).get();
|
||||
assertTrue(bsqOut1.isUnspent());
|
||||
assertTrue(bsqOut1.getValue() == bsqTx1Value1);
|
||||
TxOutput bsqOut2 = bsqBlockChainReadModel.getSpendableTxOutput(bsqTx1Id, 1).get();
|
||||
TxOutput bsqOut2 = readModel.getSpendableTxOutput(bsqTx1Id, 1).get();
|
||||
assertTrue(bsqOut2.isUnspent());
|
||||
assertTrue(bsqOut2.getValue() == bsqTx1Value2);
|
||||
assertFalse(bsqBlockChainReadModel.isTxOutputSpendable(genesisId, 0));
|
||||
assertTrue(bsqBlockChainReadModel.isTxOutputSpendable(bsqTx1Id, 0));
|
||||
assertTrue(bsqBlockChainReadModel.isTxOutputSpendable(bsqTx1Id, 1));
|
||||
assertFalse(readModel.isTxOutputSpendable(genesisTxId, 0));
|
||||
assertTrue(readModel.isTxOutputSpendable(bsqTx1Id, 0));
|
||||
assertTrue(readModel.isTxOutputSpendable(bsqTx1Id, 1));
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue