3
0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-15 03:35:52 +00:00

Use ScriptBuilder.createOpReturnScript() in tests.

This commit is contained in:
Andreas Schildbach 2016-03-12 19:57:08 +01:00
parent c3b19bd5cd
commit a3c5506a57
2 changed files with 3 additions and 8 deletions

View File

@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableList;
import org.bitcoinj.params.MainNetParams;
import org.bitcoinj.script.Script;
import org.bitcoinj.script.ScriptBuilder;
import org.bitcoinj.script.ScriptOpCodes;
import org.bitcoinj.testing.TestWithWallet;
import org.hamcrest.CoreMatchers;
import org.junit.After;
@ -61,8 +60,7 @@ public class TransactionOutputTest extends TestWithWallet {
@Test
public void getAddressTests() throws Exception {
Transaction tx = new Transaction(MainNetParams.get());
Script script = new ScriptBuilder().op(ScriptOpCodes.OP_RETURN).data("hello world!".getBytes()).build();
tx.addOutput(Coin.CENT, script);
tx.addOutput(Coin.CENT, ScriptBuilder.createOpReturnScript("hello world!".getBytes()));
assertNull(tx.getOutput(0).getAddressFromP2SH(PARAMS));
assertNull(tx.getOutput(0).getAddressFromP2PKHScript(PARAMS));
}

View File

@ -26,7 +26,6 @@ import org.bitcoinj.core.Wallet.SendRequest;
import org.bitcoinj.crypto.*;
import org.bitcoinj.script.Script;
import org.bitcoinj.script.ScriptBuilder;
import org.bitcoinj.script.ScriptOpCodes;
import org.bitcoinj.signers.StatelessTransactionSigner;
import org.bitcoinj.signers.TransactionSigner;
import org.bitcoinj.store.BlockStoreException;
@ -2268,8 +2267,7 @@ public class WalletTest extends TestWithWallet {
receiveATransactionAmount(wallet, myAddress, Coin.COIN);
Transaction tx = new Transaction(PARAMS);
Address notMyAddr = new ECKey().toAddress(PARAMS);
Script script = new ScriptBuilder().op(ScriptOpCodes.OP_RETURN).data("hello world!".getBytes()).build();
tx.addOutput(Coin.ZERO, script);
tx.addOutput(Coin.ZERO, ScriptBuilder.createOpReturnScript("hello world!".getBytes()));
tx.addOutput(Coin.SATOSHI, notMyAddr);
SendRequest request = Wallet.SendRequest.forTx(tx);
wallet.completeTx(request);
@ -2281,8 +2279,7 @@ public class WalletTest extends TestWithWallet {
receiveATransaction(wallet, myAddress);
Transaction tx = new Transaction(PARAMS);
Address notMyAddr = new ECKey().toAddress(PARAMS);
Script script = new ScriptBuilder().op(ScriptOpCodes.OP_RETURN).data("hello world!".getBytes()).build();
tx.addOutput(Coin.CENT, script);
tx.addOutput(Coin.CENT, ScriptBuilder.createOpReturnScript("hello world!".getBytes()));
tx.addOutput(Transaction.MIN_NONDUST_OUTPUT.subtract(SATOSHI), notMyAddr);
SendRequest request = Wallet.SendRequest.forTx(tx);
wallet.completeTx(request);