mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring: Rename methods

Browse source
This commit is contained in:
Manfred Karrer 2018-01-24 20:43:30 -05:00
parent f1d60ddcdb
commit 6895ac9105
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/io/bisq/common/util/FunctionalReadWriteLock.java
View file

@ -41,10 +41,10 @@ public class FunctionalReadWriteLock {
} }
} }
public <T> T write(Supplier<T> supplier) { public <T> T write(Supplier<T> block) {
writeLock.lock(); writeLock.lock();
try { try {
return supplier.get(); return block.get();
} finally { } finally {
writeLock.unlock(); writeLock.unlock();
} }

38
core/src/main/java/io/bisq/core/dao/blockchain/parse/BsqParser.java
View file

@ -290,17 +290,17 @@ public class BsqParser {
// Not thread safe wrt bsqBlockChain // Not thread safe wrt bsqBlockChain
// Check if any of the inputs are BSQ inputs and update BsqBlockChain state accordingly // Check if any of the inputs are BSQ inputs and update BsqBlockChain state accordingly
private boolean isBsqTxUnsafe(int blockHeight, Tx tx) { private boolean isBsqTxUnsafe(int blockHeight, Tx tx) {
log.error("isbsqtx tx={}", tx.toString()); log.error("isBsqTxUnsafe tx={}", tx.toString());
boolean isBsqTx = false; boolean isBsqTx = false;
long availableBsq = 0; long availableBsqFromInputs = 0;
// For each input in tx // For each input in tx
for (int inputIndex = 0; inputIndex < tx.getInputs().size(); inputIndex++) { for (int inputIndex = 0; inputIndex < tx.getInputs().size(); inputIndex++) {
availableBsq += getAvailableBsqUnsafe(blockHeight, tx, inputIndex); availableBsqFromInputs += getBsqFromInput(blockHeight, tx, inputIndex);
} }
// If we have an input with BSQ we iterate the outputs // If we have an input with BSQ we iterate the outputs
if (availableBsq > 0) { if (availableBsqFromInputs > 0) {
bsqBlockChain.addTxToMap(tx); bsqBlockChain.addTxToMap(tx);
isBsqTx = true; isBsqTx = true;
@ -314,14 +314,14 @@ public class BsqParser {
// We do not check for pubKeyScript.scriptType.NULL_DATA because that is only set if dumpBlockchainData is true // We do not check for pubKeyScript.scriptType.NULL_DATA because that is only set if dumpBlockchainData is true
if (txOutput.getOpReturnData() == null) { if (txOutput.getOpReturnData() == null) {
if (availableBsq >= txOutputValue && txOutputValue != 0) { if (availableBsqFromInputs >= txOutputValue && txOutputValue != 0) {
// We are spending available tokens // We are spending available tokens
makeBsqUnsafe(txOutput, tx); markOutputAsBsq(txOutput, tx);
availableBsq -= txOutputValue; availableBsqFromInputs -= txOutputValue;
bsqOutput = txOutput; bsqOutput = txOutput;
if (availableBsq == 0) if (availableBsqFromInputs == 0)
log.debug("We don't have anymore BSQ to spend"); log.debug("We don't have anymore BSQ to spend");
} else if (availableBsq > 0 && compRequestIssuanceOutputCandidate == null) { } else if (availableBsqFromInputs > 0 && compRequestIssuanceOutputCandidate == null) {
// availableBsq must be > 0 as we expect a bsqFee for an compRequestIssuanceOutput // availableBsq must be > 0 as we expect a bsqFee for an compRequestIssuanceOutput
// We store the btc output as it might be the issuance output from a compensation request which might become BSQ after voting. // We store the btc output as it might be the issuance output from a compensation request which might become BSQ after voting.
compRequestIssuanceOutputCandidate = txOutput; compRequestIssuanceOutputCandidate = txOutput;
@ -337,15 +337,15 @@ public class BsqParser {
} }
} else { } else {
// availableBsq is used as bsqFee paid to miners (burnt) if OP-RETURN is used // availableBsq is used as bsqFee paid to miners (burnt) if OP-RETURN is used
opReturnVerification.processDaoOpReturnData(tx, index, availableBsq, blockHeight, compRequestIssuanceOutputCandidate, bsqOutput); opReturnVerification.processDaoOpReturnData(tx, index, availableBsqFromInputs, blockHeight, compRequestIssuanceOutputCandidate, bsqOutput);
} }
} }
if (availableBsq > 0) { if (availableBsqFromInputs > 0) {
log.debug("BSQ have been left which was not spent. Burned BSQ amount={}, tx={}", log.debug("BSQ have been left which was not spent. Burned BSQ amount={}, tx={}",
availableBsq, availableBsqFromInputs,
tx.toString()); tx.toString());
tx.setBurntFee(availableBsq); tx.setBurntFee(availableBsqFromInputs);
if (tx.getTxType() == null) if (tx.getTxType() == null)
tx.setTxType(TxType.PAY_TRADE_FEE); tx.setTxType(TxType.PAY_TRADE_FEE);
} }
@ -357,8 +357,9 @@ public class BsqParser {
return isBsqTx; return isBsqTx;
} }
private long getAvailableBsqUnsafe(int blockHeight, Tx tx, int inputIndex) { // Not thread safe wrt bsqBlockChain
long availableBsq = 0; private long getBsqFromInput(int blockHeight, Tx tx, int inputIndex) {
long bsqFromInput = 0;
TxInput input = tx.getInputs().get(inputIndex); TxInput input = tx.getInputs().get(inputIndex);
// TODO check if Tuple indexes of inputs outputs are not messed up... // TODO check if Tuple indexes of inputs outputs are not messed up...
// Get spendable BSQ output for txidindextuple... (get output used as input in tx if it's spendable BSQ) // Get spendable BSQ output for txidindextuple... (get output used as input in tx if it's spendable BSQ)
@ -370,12 +371,13 @@ public class BsqParser {
bsqBlockChain.removeUnspentTxOutput(spentTxOutput); bsqBlockChain.removeUnspentTxOutput(spentTxOutput);
spentTxOutput.setSpentInfo(new SpentInfo(blockHeight, tx.getId(), inputIndex)); spentTxOutput.setSpentInfo(new SpentInfo(blockHeight, tx.getId(), inputIndex));
input.setConnectedTxOutput(spentTxOutput); input.setConnectedTxOutput(spentTxOutput);
availableBsq = spentTxOutput.getValue(); bsqFromInput = spentTxOutput.getValue();
} }
return availableBsq; return bsqFromInput;
} }
private void makeBsqUnsafe(TxOutput txOutput, Tx tx) { // Not thread safe wrt bsqBlockChain
private void markOutputAsBsq(TxOutput txOutput, Tx tx) {
// We are spending available tokens // We are spending available tokens
txOutput.setVerified(true); txOutput.setVerified(true);
txOutput.setUnspent(true); txOutput.setUnspent(true);