From 126ccbfd98dd501cf0009a599d783b5eff71d3d3 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sun, 16 Apr 2023 19:04:02 +0200
Subject: [PATCH] Message: restore deprecated method `unsafeBitcoinSerialize()`

Also adds a `deprecatedMembers()` test.
---
 core/src/main/java/org/bitcoinj/core/BaseMessage.java | 6 ------
 core/src/main/java/org/bitcoinj/core/Message.java     | 6 ++++++
 core/src/test/java/org/bitcoinj/core/MessageTest.java | 9 +++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/core/BaseMessage.java b/core/src/main/java/org/bitcoinj/core/BaseMessage.java
index 75af7657c..7d9f5b275 100644
--- a/core/src/main/java/org/bitcoinj/core/BaseMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/BaseMessage.java
@@ -52,12 +52,6 @@ public abstract class BaseMessage implements Message {
         return stream.toByteArray();
     }
 
-    /** @deprecated use {@link #serialize()} */
-    @Deprecated
-    public byte[] unsafeBitcoinSerialize() {
-        return serialize();
-    }
-
     /**
      * Serializes this message to the provided stream. If you just want the raw bytes use bitcoinSerialize().
      */
diff --git a/core/src/main/java/org/bitcoinj/core/Message.java b/core/src/main/java/org/bitcoinj/core/Message.java
index 6fabf99cc..09320d137 100644
--- a/core/src/main/java/org/bitcoinj/core/Message.java
+++ b/core/src/main/java/org/bitcoinj/core/Message.java
@@ -56,4 +56,10 @@ public interface Message {
     default byte[] bitcoinSerialize()  {
         return serialize();
     }
+
+    /** @deprecated use {@link #serialize()} */
+    @Deprecated
+    default byte[] unsafeBitcoinSerialize() {
+        return serialize();
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/MessageTest.java b/core/src/test/java/org/bitcoinj/core/MessageTest.java
index cc0f2e75c..0fb9c5d86 100644
--- a/core/src/test/java/org/bitcoinj/core/MessageTest.java
+++ b/core/src/test/java/org/bitcoinj/core/MessageTest.java
@@ -16,5 +16,14 @@
 
 package org.bitcoinj.core;
 
+import org.junit.Test;
+
 public class MessageTest {
+    @Test
+    public void deprecatedMembers() {
+        Message message = new UnknownMessage("dummy");
+        message.bitcoinSerialize();
+        message.unsafeBitcoinSerialize();
+        message.getMessageSize();
+    }
 }