mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2024-11-19 01:40:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Script: two private constructors for clarity

Browse Source 
This also makes parameter validation more consistent.
This commit is contained in:
Sean Gilligan 2024-09-14 16:16:32 -07:00 committed by Andreas Schildbach
parent 0cb413cc4f
commit 40a7cefe82
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/main/java/org/bitcoinj/script/Script.java
View File

@ -246,9 +246,7 @@ public class Script {
* @return script that wraps the chunks
*/
public static Script of(List<ScriptChunk> chunks, Instant creationTime) {
chunks = Collections.unmodifiableList(new ArrayList<>(chunks)); // defensive copy
Objects.requireNonNull(creationTime);
return new Script(null, chunks, creationTime);
return new Script(chunks, creationTime);
}
/**
@ -274,10 +272,7 @@ public class Script {
* @throws ScriptException if the program could not be parsed
*/
public static Script parse(byte[] program, Instant creationTime) throws ScriptException {
Objects.requireNonNull(creationTime);
program = Arrays.copyOf(program, program.length); // defensive copy
List<ScriptChunk> chunks = parseIntoChunks(program);
return new Script(program, chunks, creationTime);
return new Script(program, creationTime);
}
/**
@ -339,9 +334,22 @@ public class Script {
}
}
private Script(byte[] programBytes, List<ScriptChunk> chunks, Instant creationTime) {
this.program = programBytes;
this.chunks = chunks;
// When constructing from a program, we store both program and chunks
private Script(byte[] program, Instant creationTime) {
Objects.requireNonNull(program);
Objects.requireNonNull(creationTime);
this.program = Arrays.copyOf(program, program.length); // defensive copy;
this.chunks = parseIntoChunks(this.program);
this.creationTime = creationTime;
}
// When constructing from chunks, we store only chunks, and generate program when getter is called
private Script(List<ScriptChunk> chunks, Instant creationTime) {
Objects.requireNonNull(chunks);
Objects.requireNonNull(creationTime);
this.program = null;
this.chunks = Collections.unmodifiableList(new ArrayList<>(chunks)); // defensive copy
this.creationTime = creationTime;
}