diff --git a/core/src/main/java/org/bitcoinj/core/PrefixedChecksummedBytes.java b/core/src/main/java/org/bitcoinj/core/PrefixedChecksummedBytes.java index 67e191c4c..07d2d0267 100644 --- a/core/src/main/java/org/bitcoinj/core/PrefixedChecksummedBytes.java +++ b/core/src/main/java/org/bitcoinj/core/PrefixedChecksummedBytes.java @@ -40,7 +40,7 @@ import static com.google.common.base.Preconditions.checkNotNull; * keys exported using Bitcoin Core's dumpprivkey command. *

*/ -public abstract class PrefixedChecksummedBytes implements Serializable, Cloneable { +public abstract class PrefixedChecksummedBytes implements Serializable { protected final transient NetworkParameters params; protected final byte[] bytes; @@ -69,16 +69,6 @@ public abstract class PrefixedChecksummedBytes implements Serializable, Cloneabl return this.params.equals(other.params) && Arrays.equals(this.bytes, other.bytes); } - /** - * This implementation narrows the return type to {@link PrefixedChecksummedBytes} - * and allows subclasses to throw {@link CloneNotSupportedException} even though it - * is never thrown by this implementation. - */ - @Override - public PrefixedChecksummedBytes clone() throws CloneNotSupportedException { - return (PrefixedChecksummedBytes) super.clone(); - } - // Java serialization private void writeObject(ObjectOutputStream out) throws IOException { diff --git a/core/src/test/java/org/bitcoinj/core/DumpedPrivateKeyTest.java b/core/src/test/java/org/bitcoinj/core/DumpedPrivateKeyTest.java index 2ccccc700..790e42645 100644 --- a/core/src/test/java/org/bitcoinj/core/DumpedPrivateKeyTest.java +++ b/core/src/test/java/org/bitcoinj/core/DumpedPrivateKeyTest.java @@ -56,16 +56,6 @@ public class DumpedPrivateKeyTest { assertEquals(key, keyCopy); } - @Test - public void cloning() throws Exception { - DumpedPrivateKey a = new DumpedPrivateKey(MAINNET, new ECKey().getPrivKeyBytes(), true); - // TODO: Consider overriding clone() in DumpedPrivateKey to narrow the type - DumpedPrivateKey b = (DumpedPrivateKey) a.clone(); - - assertEquals(a, b); - assertNotSame(a, b); - } - @Test public void roundtripBase58() { String base58 = "5HtUCLMFWNueqN9unpgX2DzjMg6SDNZyKRb8s3LJgpFg5ubuMrk"; // 32-bytes key diff --git a/core/src/test/java/org/bitcoinj/core/LegacyAddressTest.java b/core/src/test/java/org/bitcoinj/core/LegacyAddressTest.java index f56a2e5dc..cfc70b509 100644 --- a/core/src/test/java/org/bitcoinj/core/LegacyAddressTest.java +++ b/core/src/test/java/org/bitcoinj/core/LegacyAddressTest.java @@ -208,30 +208,12 @@ public class LegacyAddressTest { assertEquals("3N25saC4dT24RphDAwLtD8LUN4E2gZPJke", address.toString()); } - @Test - public void cloning() throws Exception { - LegacyAddress a = LegacyAddress.fromPubKeyHash(TESTNET, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc")); - LegacyAddress b = a.clone(); - - assertEquals(a, b); - assertNotSame(a, b); - } - @Test public void roundtripBase58() { String base58 = "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL"; assertEquals(base58, LegacyAddress.fromBase58(null, base58).toBase58()); } - @Test - public void comparisonCloneEqualTo() throws Exception { - LegacyAddress a = LegacyAddress.fromBase58(MAINNET, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX"); - LegacyAddress b = a.clone(); - - int result = a.compareTo(b); - assertEquals(0, result); - } - @Test public void comparisonLessThan() { LegacyAddress a = LegacyAddress.fromBase58(MAINNET, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX"); diff --git a/core/src/test/java/org/bitcoinj/core/PrefixedChecksummedBytesTest.java b/core/src/test/java/org/bitcoinj/core/PrefixedChecksummedBytesTest.java index d946f97f4..f69239bed 100644 --- a/core/src/test/java/org/bitcoinj/core/PrefixedChecksummedBytesTest.java +++ b/core/src/test/java/org/bitcoinj/core/PrefixedChecksummedBytesTest.java @@ -71,29 +71,4 @@ public class PrefixedChecksummedBytesTest { PrefixedChecksummedBytes b = new PrefixedChecksummedBytesToTest(params, HEX.decode("4a22c3c4cbb31e4d03b15550636762bda0baf85a")); assertEquals("17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL", b.toString()); } - - @Test - public void cloning() throws Exception { - expect(params.getAddressHeader()).andReturn(111); - replay(params); - - PrefixedChecksummedBytes a = new PrefixedChecksummedBytesToTest(params, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc")); - PrefixedChecksummedBytes b = a.clone(); - - assertEquals(a, b); - assertNotSame(a, b); - } - - @Test - public void comparisonCloneEqualTo() throws Exception { - expect(params.getAddressHeader()).andReturn(111); - expect(params.getId()).andReturn("org.bitcoin.test").times(2); - replay(params); - - PrefixedChecksummedBytes a = new PrefixedChecksummedBytesToTest(params, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc")); - PrefixedChecksummedBytes b = a.clone(); - - assertNotSame(a, b); - assertEquals(a, b); - } } diff --git a/core/src/test/java/org/bitcoinj/crypto/BIP38PrivateKeyTest.java b/core/src/test/java/org/bitcoinj/crypto/BIP38PrivateKeyTest.java index 4c220d024..4e7fba15c 100644 --- a/core/src/test/java/org/bitcoinj/crypto/BIP38PrivateKeyTest.java +++ b/core/src/test/java/org/bitcoinj/crypto/BIP38PrivateKeyTest.java @@ -176,16 +176,6 @@ public class BIP38PrivateKeyTest { assertEquals(mainKey, mainKeyCopy); } - @Test - public void cloning() throws Exception { - BIP38PrivateKey a = BIP38PrivateKey.fromBase58(TESTNET, "6PfMmVHn153N3x83Yiy4Nf76dHUkXufe2Adr9Fw5bewrunGNeaw2QCpifb"); - // TODO: Consider overriding clone() in BIP38PrivateKey to narrow the type - BIP38PrivateKey b = (BIP38PrivateKey) a.clone(); - - assertEquals(a, b); - assertNotSame(a, b); - } - @Test public void roundtripBase58() { String base58 = "6PfMmVHn153N3x83Yiy4Nf76dHUkXufe2Adr9Fw5bewrunGNeaw2QCpifb";