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

Move Script and ScriptOpCodes to a new script package.

Browse source
This commit is contained in:
Mike Hearn 2013-04-23 18:51:08 +02:00
parent 775af907ae
commit 7db7f89582
13 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/main/java/com/google/bitcoin/core/Block.java
View file

@ -16,6 +16,7 @@
package com.google.bitcoin.core;
import com.google.bitcoin.script.Script;
import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
core/src/main/java/com/google/bitcoin/core/FullPrunedBlockChain.java
View file

@ -16,6 +16,7 @@
package com.google.bitcoin.core;
import com.google.bitcoin.script.Script;
import com.google.bitcoin.store.BlockStoreException;
import com.google.bitcoin.store.FullPrunedBlockStore;
import org.slf4j.Logger;

2
core/src/main/java/com/google/bitcoin/core/NetworkParameters.java
View file

@ -16,6 +16,8 @@
package com.google.bitcoin.core;
import com.google.bitcoin.script.Script;
import com.google.bitcoin.script.ScriptOpCodes;
import com.google.common.base.Objects;
import org.spongycastle.util.encoders.Hex;

2
core/src/main/java/com/google/bitcoin/core/Transaction.java
View file

@ -17,6 +17,8 @@
package com.google.bitcoin.core;
import com.google.bitcoin.core.TransactionConfidence.ConfidenceType;
import com.google.bitcoin.script.Script;
import com.google.bitcoin.script.ScriptOpCodes;
import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
core/src/main/java/com/google/bitcoin/core/TransactionInput.java
View file

@ -16,6 +16,7 @@
package com.google.bitcoin.core;
import com.google.bitcoin.script.Script;
import com.google.common.base.Preconditions;
import java.io.IOException;

2
core/src/main/java/com/google/bitcoin/core/TransactionOutPoint.java
View file

@ -16,6 +16,8 @@
package com.google.bitcoin.core;
import com.google.bitcoin.script.Script;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.OutputStream;

1
core/src/main/java/com/google/bitcoin/core/TransactionOutput.java
View file

@ -16,6 +16,7 @@
package com.google.bitcoin.core;
import com.google.bitcoin.script.Script;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

7
core/src/main/java/com/google/bitcoin/core/Script.java → core/src/main/java/com/google/bitcoin/script/Script.java
View file

@ -15,8 +15,9 @@
* limitations under the License.
*/
package com.google.bitcoin.core;
package com.google.bitcoin.script;
import com.google.bitcoin.core.*;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -31,7 +32,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.*;
import static com.google.bitcoin.core.ScriptOpCodes.*;
import static com.google.bitcoin.script.ScriptOpCodes.*;
import static com.google.bitcoin.core.Utils.bytesToHexString;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
@ -304,7 +305,7 @@ public class Script {
* Writes out the given byte buffer to the output stream with the correct opcode prefix
* To write an integer call writeBytes(out, Utils.reverseBytes(Utils.encodeMPI(val, false)));
*/
static void writeBytes(OutputStream os, byte[] buf) throws IOException {
public static void writeBytes(OutputStream os, byte[] buf) throws IOException {
if (buf.length < OP_PUSHDATA1) {
os.write(buf.length);
os.write(buf);

4
core/src/main/java/com/google/bitcoin/core/ScriptOpCodes.java → core/src/main/java/com/google/bitcoin/script/ScriptOpCodes.java
View file

@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.google.bitcoin.core;
package com.google.bitcoin.script;
/**
* Various constants that define the assembly-like scripting language that forms part of the Bitcoin protocol.
* See {@link Script} for details. Also provides a method to convert them to a string.
* See {@link com.google.bitcoin.script.Script} for details. Also provides a method to convert them to a string.
*/
public class ScriptOpCodes {
// push value

1
core/src/test/java/com/google/bitcoin/core/BlockTest.java
View file

@ -16,6 +16,7 @@
package com.google.bitcoin.core;
import com.google.bitcoin.script.ScriptOpCodes;
import org.junit.Test;
import org.spongycastle.util.encoders.Hex;

3
core/src/test/java/com/google/bitcoin/core/FullBlockTestGenerator.java
View file

@ -1,6 +1,7 @@
package com.google.bitcoin.core;
import com.google.bitcoin.core.Transaction.SigHash;
import com.google.bitcoin.script.Script;
import com.google.common.base.Preconditions;
import java.io.ByteArrayOutputStream;
@ -8,7 +9,7 @@ import java.io.IOException;
import java.math.BigInteger;
import java.util.*;
import static com.google.bitcoin.core.ScriptOpCodes.*;
import static com.google.bitcoin.script.ScriptOpCodes.*;
class BlockAndValidity {
Block block;

1
core/src/test/java/com/google/bitcoin/core/FullPrunedBlockChainTest.java
View file

@ -18,6 +18,7 @@
package com.google.bitcoin.core;
import com.google.bitcoin.core.Transaction.SigHash;
import com.google.bitcoin.script.Script;
import com.google.bitcoin.store.FullPrunedBlockStore;
import com.google.bitcoin.store.MemoryFullPrunedBlockStore;
import com.google.bitcoin.utils.BriefLogFormatter;

2
core/src/test/java/com/google/bitcoin/core/ScriptTest.java
View file

@ -16,6 +16,8 @@
package com.google.bitcoin.core;
import com.google.bitcoin.script.Script;
import com.google.bitcoin.script.ScriptOpCodes;
import com.google.common.collect.Lists;
import org.junit.Test;
import org.spongycastle.util.encoders.Hex;