From 96bdad5a6738f11360108b87d9c16611177a3d38 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Thu, 22 Feb 2018 11:08:58 +0100
Subject: [PATCH] Utils: Move copyOf() to UnsafeByteArrayOutputStream, as it's
 only being used there.

---
 .../bitcoinj/core/UnsafeByteArrayOutputStream.java    | 11 ++++++++---
 core/src/main/java/org/bitcoinj/core/Utils.java       |  6 ------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java b/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java
index e6dd0214..52e44fd9 100644
--- a/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java
+++ b/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java
@@ -49,7 +49,7 @@ public class UnsafeByteArrayOutputStream extends ByteArrayOutputStream {
     public void write(int b) {
         int newcount = count + 1;
         if (newcount > buf.length) {
-            buf = Utils.copyOf(buf, Math.max(buf.length << 1, newcount));
+            buf = copyOf(buf, Math.max(buf.length << 1, newcount));
         }
         buf[count] = (byte) b;
         count = newcount;
@@ -73,7 +73,7 @@ public class UnsafeByteArrayOutputStream extends ByteArrayOutputStream {
         }
         int newcount = count + len;
         if (newcount > buf.length) {
-            buf = Utils.copyOf(buf, Math.max(buf.length << 1, newcount));
+            buf = copyOf(buf, Math.max(buf.length << 1, newcount));
         }
         System.arraycopy(b, off, buf, count, len);
         count = newcount;
@@ -115,7 +115,7 @@ public class UnsafeByteArrayOutputStream extends ByteArrayOutputStream {
      */
     @Override
     public byte toByteArray()[] {
-        return count == buf.length ? buf : Utils.copyOf(buf, count);
+        return count == buf.length ? buf : copyOf(buf, count);
     }
 
     /**
@@ -130,4 +130,9 @@ public class UnsafeByteArrayOutputStream extends ByteArrayOutputStream {
         return count;
     }
 
+    private static byte[] copyOf(byte[] in, int length) {
+        byte[] out = new byte[length];
+        System.arraycopy(in, 0, out, 0, Math.min(length, in.length));
+        return out;
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/Utils.java b/core/src/main/java/org/bitcoinj/core/Utils.java
index 2faada84..29326a62 100644
--- a/core/src/main/java/org/bitcoinj/core/Utils.java
+++ b/core/src/main/java/org/bitcoinj/core/Utils.java
@@ -402,12 +402,6 @@ public class Utils {
         return iso8601.format(dateTime);
     }
 
-    public static byte[] copyOf(byte[] in, int length) {
-        byte[] out = new byte[length];
-        System.arraycopy(in, 0, out, 0, Math.min(length, in.length));
-        return out;
-    }
-
     /**
      * Attempts to parse the given string as arbitrary-length hex or base58 and then return the results, or null if
      * neither parse was successful.