AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed DataFileMessage to ArbitraryDataFileMessage and GetDataFileMessage to GetArbitraryDataFileMessage

Browse Source
This commit is contained in:
CalDescent 2021-08-14 13:52:41 +01:00
parent 172a37ec8c
commit e99ea41117
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/qortal/api/resource/ArbitraryResource.java
View File

@ -38,8 +38,8 @@ import org.qortal.group.Group;
import org.qortal.network.Network; import org.qortal.network.Network;
import org.qortal.network.Peer; import org.qortal.network.Peer;
import org.qortal.network.PeerAddress; import org.qortal.network.PeerAddress;
import org.qortal.network.message.DataFileMessage; import org.qortal.network.message.ArbitraryDataFileMessage;
import org.qortal.network.message.GetDataFileMessage; import org.qortal.network.message.GetArbitraryDataFileMessage;
import org.qortal.network.message.Message; import org.qortal.network.message.Message;
import org.qortal.repository.DataException; import org.qortal.repository.DataException;
import org.qortal.repository.Repository; import org.qortal.repository.Repository;
@ -515,7 +515,7 @@ public class ArbitraryResource {
LOGGER.info("Invalid base58 encoded string"); LOGGER.info("Invalid base58 encoded string");
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
} }
Message getDataFileMessage = new GetDataFileMessage(digest); Message getDataFileMessage = new GetArbitraryDataFileMessage(digest);
Message message = targetPeer.getResponse(getDataFileMessage); Message message = targetPeer.getResponse(getDataFileMessage);
if (message == null) { if (message == null) {
@ -525,12 +525,12 @@ public class ArbitraryResource {
return false; return false;
} }
DataFileMessage dataFileMessage = (DataFileMessage) message; ArbitraryDataFileMessage arbitraryDataFileMessage = (ArbitraryDataFileMessage) message;
arbitraryDataFile = dataFileMessage.getArbitraryDataFile(); arbitraryDataFile = arbitraryDataFileMessage.getArbitraryDataFile();
if (arbitraryDataFile == null || !arbitraryDataFile.exists()) { if (arbitraryDataFile == null || !arbitraryDataFile.exists()) {
return false; return false;
} }
LOGGER.info(String.format("Received file %s, size %d bytes", dataFileMessage.getArbitraryDataFile(), dataFileMessage.getArbitraryDataFile().size())); LOGGER.info(String.format("Received file %s, size %d bytes", arbitraryDataFileMessage.getArbitraryDataFile(), arbitraryDataFileMessage.getArbitraryDataFile().size()));
return true; return true;
} catch (ApiException e) { } catch (ApiException e) {
throw e; throw e;

16
src/main/java/org/qortal/controller/ArbitraryDataManager.java
View File

@ -170,7 +170,7 @@ public class ArbitraryDataManager extends Thread {
String hash58 = Base58.encode(hash); String hash58 = Base58.encode(hash);
LOGGER.info(String.format("Fetching data file %.8s from peer %s", hash58, peer)); LOGGER.info(String.format("Fetching data file %.8s from peer %s", hash58, peer));
arbitraryDataFileRequests.put(hash58, NTP.getTime()); arbitraryDataFileRequests.put(hash58, NTP.getTime());
Message getDataFileMessage = new GetDataFileMessage(hash); Message getDataFileMessage = new GetArbitraryDataFileMessage(hash);
Message message = peer.getResponse(getDataFileMessage); Message message = peer.getResponse(getDataFileMessage);
arbitraryDataFileRequests.remove(hash58); arbitraryDataFileRequests.remove(hash58);
@ -180,8 +180,8 @@ public class ArbitraryDataManager extends Thread {
return null; return null;
} }
DataFileMessage dataFileMessage = (DataFileMessage) message; ArbitraryDataFileMessage arbitraryDataFileMessage = (ArbitraryDataFileMessage) message;
return dataFileMessage.getArbitraryDataFile(); return arbitraryDataFileMessage.getArbitraryDataFile();
} }
public void cleanupRequestCache(long now) { public void cleanupRequestCache(long now) {
@ -314,15 +314,15 @@ public class ArbitraryDataManager extends Thread {
} }
public void onNetworkGetDataFileMessage(Peer peer, Message message) { public void onNetworkGetDataFileMessage(Peer peer, Message message) {
GetDataFileMessage getDataFileMessage = (GetDataFileMessage) message; GetArbitraryDataFileMessage getArbitraryDataFileMessage = (GetArbitraryDataFileMessage) message;
byte[] hash = getDataFileMessage.getHash(); byte[] hash = getArbitraryDataFileMessage.getHash();
Controller.getInstance().stats.getDataFileMessageStats.requests.incrementAndGet(); Controller.getInstance().stats.getDataFileMessageStats.requests.incrementAndGet();
ArbitraryDataFile arbitraryDataFile = ArbitraryDataFile.fromHash(hash); ArbitraryDataFile arbitraryDataFile = ArbitraryDataFile.fromHash(hash);
if (arbitraryDataFile.exists()) { if (arbitraryDataFile.exists()) {
DataFileMessage dataFileMessage = new DataFileMessage(arbitraryDataFile); ArbitraryDataFileMessage arbitraryDataFileMessage = new ArbitraryDataFileMessage(arbitraryDataFile);
dataFileMessage.setId(message.getId()); arbitraryDataFileMessage.setId(message.getId());
if (!peer.sendMessage(dataFileMessage)) { if (!peer.sendMessage(arbitraryDataFileMessage)) {
LOGGER.info("Couldn't sent file"); LOGGER.info("Couldn't sent file");
peer.disconnect("failed to send file"); peer.disconnect("failed to send file");
} }

12
src/main/java/org/qortal/network/message/ArbitraryDataFileMessage.java
View File

@ -8,17 +8,17 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public class DataFileMessage extends Message { public class ArbitraryDataFileMessage extends Message {
private final ArbitraryDataFile arbitraryDataFile; private final ArbitraryDataFile arbitraryDataFile;
public DataFileMessage(ArbitraryDataFile arbitraryDataFile) { public ArbitraryDataFileMessage(ArbitraryDataFile arbitraryDataFile) {
super(MessageType.DATA_FILE); super(MessageType.DATA_FILE);
this.arbitraryDataFile = arbitraryDataFile; this.arbitraryDataFile = arbitraryDataFile;
} }
public DataFileMessage(int id, ArbitraryDataFile arbitraryDataFile) { public ArbitraryDataFileMessage(int id, ArbitraryDataFile arbitraryDataFile) {
super(id, MessageType.DATA_FILE); super(id, MessageType.DATA_FILE);
this.arbitraryDataFile = arbitraryDataFile; this.arbitraryDataFile = arbitraryDataFile;
@ -38,7 +38,7 @@ public class DataFileMessage extends Message {
byteBuffer.get(data); byteBuffer.get(data);
ArbitraryDataFile arbitraryDataFile = new ArbitraryDataFile(data); ArbitraryDataFile arbitraryDataFile = new ArbitraryDataFile(data);
return new DataFileMessage(id, arbitraryDataFile); return new ArbitraryDataFileMessage(id, arbitraryDataFile);
} }
@Override @Override
@ -65,8 +65,8 @@ public class DataFileMessage extends Message {
} }
} }
public DataFileMessage cloneWithNewId(int newId) { public ArbitraryDataFileMessage cloneWithNewId(int newId) {
DataFileMessage clone = new DataFileMessage(this.arbitraryDataFile); ArbitraryDataFileMessage clone = new ArbitraryDataFileMessage(this.arbitraryDataFile);
clone.setId(newId); clone.setId(newId);
return clone; return clone;
} }

8
src/main/java/org/qortal/network/message/GetDataFileMessage.java → src/main/java/org/qortal/network/message/GetArbitraryDataFileMessage.java
View File

@ -7,17 +7,17 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public class GetDataFileMessage extends Message { public class GetArbitraryDataFileMessage extends Message {
private static final int HASH_LENGTH = TransactionTransformer.SHA256_LENGTH; private static final int HASH_LENGTH = TransactionTransformer.SHA256_LENGTH;
private final byte[] hash; private final byte[] hash;
public GetDataFileMessage(byte[] hash) { public GetArbitraryDataFileMessage(byte[] hash) {
this(-1, hash); this(-1, hash);
} }
private GetDataFileMessage(int id, byte[] hash) { private GetArbitraryDataFileMessage(int id, byte[] hash) {
super(id, MessageType.GET_DATA_FILE); super(id, MessageType.GET_DATA_FILE);
this.hash = hash; this.hash = hash;
@ -35,7 +35,7 @@ public class GetDataFileMessage extends Message {
bytes.get(hash); bytes.get(hash);
return new GetDataFileMessage(id, hash); return new GetArbitraryDataFileMessage(id, hash);
} }
@Override @Override