Remove unused Message.checksum.

bitcoinj · Jul 23, 2015 · c169325 · c169325
1 parent 783dfc5
commit c169325
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 53 deletions.
diff --git a/core/src/main/java/org/bitcoinj/core/AddressMessage.java b/core/src/main/java/org/bitcoinj/core/AddressMessage.java
@@ -99,17 +99,6 @@ public int getMessageSize() {
         return length;
     }
 
-    /**
-     * AddressMessage cannot cache checksum in non-retain mode due to dynamic time being used.
-     */
-    @Override
-    void setChecksum(byte[] checksum) {
-        if (parseRetain)
-            super.setChecksum(checksum);
-        else
-            this.checksum = null;
-    }
-
     /**
      * @return An unmodifiableList view of the backing List of addresses.  Addresses contained within the list may be safely modified.
      */

diff --git a/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java b/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java
@@ -243,8 +243,6 @@ private Message makeMessage(String command, int length, byte[] payloadBytes, byt
             log.warn("No support for deserializing message with name {}", command);
             return new UnknownMessage(params, command, payloadBytes);
         }
-        if (checksum != null)
-            message.setChecksum(checksum);
         return message;
     }
 

diff --git a/core/src/main/java/org/bitcoinj/core/Block.java b/core/src/main/java/org/bitcoinj/core/Block.java
@@ -478,7 +478,6 @@ private void unCacheHeader() {
         if (!transactionBytesValid)
             payload = null;
         hash = null;
-        checksum = null;
     }
 
     private void unCacheTransactions() {

diff --git a/core/src/main/java/org/bitcoinj/core/Message.java b/core/src/main/java/org/bitcoinj/core/Message.java
@@ -59,8 +59,6 @@ public abstract class Message {
 
     protected int protocolVersion;
 
-    protected byte[] checksum;
-
     protected NetworkParameters params;
 
     protected Message() {
@@ -209,7 +207,6 @@ public void ensureParsed() throws ProtocolException {
      */
     protected void unCache() {
         maybeParse();
-        checksum = null;
         payload = null;
         recached = false;
     }
@@ -248,26 +245,6 @@ public boolean isRecached() {
         return recached;
     }
 
-    /**
-     * Should only used by BitcoinSerializer for cached checksum
-     *
-     * @return the checksum
-     */
-    byte[] getChecksum() {
-        return checksum;
-    }
-
-    /**
-     * Should only used by BitcoinSerializer for caching checksum
-     *
-     * @param checksum the checksum to set
-     */
-    void setChecksum(byte[] checksum) {
-        if (checksum.length != 4)
-            throw new IllegalArgumentException("Checksum length must be 4 bytes, actual length: " + checksum.length);
-        this.checksum = checksum;
-    }
-
     /**
      * Returns a copy of the array returned by {@link Message#unsafeBitcoinSerialize()}, which is safe to mutate.
      * If you need extra performance and can guarantee you won't write to the array, you can use the unsafe version.

diff --git a/core/src/main/java/org/bitcoinj/core/VersionMessage.java b/core/src/main/java/org/bitcoinj/core/VersionMessage.java
@@ -216,22 +216,6 @@ public int hashCode() {
             time, subVer, myAddr, theirAddr, relayTxesBeforeFilter);
     }
 
-    /**
-     * VersionMessage does not handle cached byte array so should not have a cached checksum.
-     */
-    @Override
-    byte[] getChecksum() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * VersionMessage does not handle cached byte array so should not have a cached checksum.
-     */
-    @Override
-    void setChecksum(byte[] checksum) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public String toString() {
         StringBuilder stringBuilder = new StringBuilder();