mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-01-18 21:32:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Message: remove params field and accessor

Browse Source
This commit is contained in:
Andreas Schildbach 2023-04-03 19:16:03 +02:00
parent 4f872b9dce
commit 5ded7782be
2 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/main/java/org/bitcoinj/core/Message.java
View File

@ -21,13 +21,11 @@ import org.bitcoinj.base.Sha256Hash;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.util.Objects;
/**
* <p>A Message is a data structure that can be serialized/deserialized using the Bitcoin serialization format.
@ -43,39 +41,21 @@ public abstract class Message {
protected final MessageSerializer serializer;
@Nullable
protected final NetworkParameters params;
protected Message() {
this.params = null;
this.serializer = DummySerializer.DEFAULT;
}
protected Message(NetworkParameters params) {
this.params = params;
this.serializer = params.getDefaultSerializer();
}
protected Message(MessageSerializer serializer) {
this.params = null;
this.serializer = serializer;
}
protected Message(NetworkParameters params, MessageSerializer serializer) {
this.params = params;
this.serializer = serializer;
}
/**
*
* @param params NetworkParameters object.
* @param payload Bitcoin protocol formatted byte array containing message content.
* @param serializer the serializer to use for this message.
* @throws ProtocolException
*/
protected Message(NetworkParameters params, ByteBuffer payload, MessageSerializer serializer) throws ProtocolException {
protected Message(ByteBuffer payload, MessageSerializer serializer) throws ProtocolException {
this.serializer = serializer;
this.params = params;
try {
parse(payload);
@ -85,15 +65,7 @@ public abstract class Message {
}
protected Message(ByteBuffer payload) throws ProtocolException {
this(null, payload, DummySerializer.DEFAULT);
}
protected Message(ByteBuffer payload, MessageSerializer serializer) throws ProtocolException {
this(null, payload, serializer);
}
protected Message(NetworkParameters params, ByteBuffer payload) throws ProtocolException {
this(params, payload, params.getDefaultSerializer());
this(payload, DummySerializer.DEFAULT);
}
// These methods handle the serialization/deserialization using the custom Bitcoin protocol.
@ -143,9 +115,4 @@ public abstract class Message {
public int getMessageSize() {
return bitcoinSerialize().length;
}
/** Network parameters this message was created with. */
public NetworkParameters getParams() {
return Objects.requireNonNull(params);
}
}

2
core/src/test/java/org/bitcoinj/core/PeerAddressTest.java
View File

@ -45,7 +45,7 @@ public class PeerAddressTest {
public void equalsContract() {
EqualsVerifier.forClass(PeerAddress.class)
.suppress(Warning.NONFINAL_FIELDS)
.withIgnoredFields("time", "params", "serializer")
.withIgnoredFields("time", "serializer")
.usingGetClass()
.verify();
}