From b18b686545e8f92a8affd635f798cdbc0e46078c Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sat, 14 Aug 2021 13:57:44 +0100
Subject: [PATCH] Renamed DATA_FILE to ARBITRARY_DATA_FILE and GET_DATA_FILE to
 GET_ARBITRARY_DATA_FILE.

This will break existing data nodes, but this is okay, as nothing is in production yet.
---
 src/main/java/org/qortal/controller/ArbitraryDataManager.java | 2 +-
 src/main/java/org/qortal/controller/Controller.java           | 2 +-
 .../org/qortal/network/message/ArbitraryDataFileMessage.java  | 4 ++--
 .../qortal/network/message/GetArbitraryDataFileMessage.java   | 2 +-
 src/main/java/org/qortal/network/message/Message.java         | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/qortal/controller/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/ArbitraryDataManager.java
index 5f611204..3fa84466 100644
--- a/src/main/java/org/qortal/controller/ArbitraryDataManager.java
+++ b/src/main/java/org/qortal/controller/ArbitraryDataManager.java
@@ -176,7 +176,7 @@ public class ArbitraryDataManager extends Thread {
 		arbitraryDataFileRequests.remove(hash58);
 		LOGGER.info(String.format("Removed hash %.8s from arbitraryDataFileRequests", hash58));
 
-		if (message == null || message.getType() != Message.MessageType.DATA_FILE) {
+		if (message == null || message.getType() != Message.MessageType.ARBITRARY_DATA_FILE) {
 			return null;
 		}
 
diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java
index 8fd9e9da..910f49c3 100644
--- a/src/main/java/org/qortal/controller/Controller.java
+++ b/src/main/java/org/qortal/controller/Controller.java
@@ -1246,7 +1246,7 @@ public class Controller extends Thread {
 				ArbitraryDataManager.getInstance().onNetworkArbitraryDataFileListMessage(peer, message);
 				break;
 
-			case GET_DATA_FILE:
+			case GET_ARBITRARY_DATA_FILE:
 				ArbitraryDataManager.getInstance().onNetworkGetDataFileMessage(peer, message);
 				break;
 
diff --git a/src/main/java/org/qortal/network/message/ArbitraryDataFileMessage.java b/src/main/java/org/qortal/network/message/ArbitraryDataFileMessage.java
index 9c73520b..289dcb49 100644
--- a/src/main/java/org/qortal/network/message/ArbitraryDataFileMessage.java
+++ b/src/main/java/org/qortal/network/message/ArbitraryDataFileMessage.java
@@ -13,13 +13,13 @@ public class ArbitraryDataFileMessage extends Message {
 	private final ArbitraryDataFile arbitraryDataFile;
 
 	public ArbitraryDataFileMessage(ArbitraryDataFile arbitraryDataFile) {
-		super(MessageType.DATA_FILE);
+		super(MessageType.ARBITRARY_DATA_FILE);
 
 		this.arbitraryDataFile = arbitraryDataFile;
 	}
 
 	public ArbitraryDataFileMessage(int id, ArbitraryDataFile arbitraryDataFile) {
-		super(id, MessageType.DATA_FILE);
+		super(id, MessageType.ARBITRARY_DATA_FILE);
 
 		this.arbitraryDataFile = arbitraryDataFile;
 	}
diff --git a/src/main/java/org/qortal/network/message/GetArbitraryDataFileMessage.java b/src/main/java/org/qortal/network/message/GetArbitraryDataFileMessage.java
index f1ae143a..f13951b7 100644
--- a/src/main/java/org/qortal/network/message/GetArbitraryDataFileMessage.java
+++ b/src/main/java/org/qortal/network/message/GetArbitraryDataFileMessage.java
@@ -18,7 +18,7 @@ public class GetArbitraryDataFileMessage extends Message {
 	}
 
 	private GetArbitraryDataFileMessage(int id, byte[] hash) {
-		super(id, MessageType.GET_DATA_FILE);
+		super(id, MessageType.GET_ARBITRARY_DATA_FILE);
 
 		this.hash = hash;
 	}
diff --git a/src/main/java/org/qortal/network/message/Message.java b/src/main/java/org/qortal/network/message/Message.java
index 3ecb151b..662eaeaf 100644
--- a/src/main/java/org/qortal/network/message/Message.java
+++ b/src/main/java/org/qortal/network/message/Message.java
@@ -85,8 +85,8 @@ public abstract class Message {
 		BLOCKS(100),
 		GET_BLOCKS(101),
 
-		DATA_FILE(110),
-		GET_DATA_FILE(111),
+		ARBITRARY_DATA_FILE(110),
+		GET_ARBITRARY_DATA_FILE(111),
 
 		ARBITRARY_DATA_FILE_LIST(120),
 		GET_ARBITRARY_DATA_FILE_LIST(121);