Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-22 20:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes and tests for SLEEP_UNTIL_MESSAGE

Browse Source
This commit is contained in:
catbref
2020-11-10 15:30:54 +00:00
parent 3253d9d3fb
commit 7a40c3526f
5 changed files with 680 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/qortal/at/AT.java
View File

@@ -106,6 +106,7 @@ public class AT {
QortalAtLoggerFactory loggerFactory = QortalAtLoggerFactory.getInstance();
if (!api.willExecute(blockHeight))
// this.atStateData will be null
return Collections.emptyList();
// Fetch latest ATStateData for this AT

3
src/main/java/org/qortal/at/QortalATAPI.java
View File

@@ -98,7 +98,6 @@ public class QortalATAPI extends API {
// Can we skip?
if (!wakeDueToHeight && !wakeDueToMessage)
// this.atStateData will be null
return false;
}
@@ -505,7 +504,7 @@ public class QortalATAPI extends API {
this.atData.setSleepUntilMessageTimestamp(txTimestamp);
if (sleepUntilHeight != null)
this.setSleepUntilHeight(state, new Timestamp(sleepUntilHeight).blockHeight);
this.setSleepUntilHeight(state, sleepUntilHeight.intValue());
}
/** Returns AT's account */

4
src/main/java/org/qortal/repository/hsqldb/HSQLDBATRepository.java
View File

@@ -54,7 +54,7 @@ public class HSQLDBATRepository implements ATRepository {
if (frozenBalance == 0 && resultSet.wasNull())
frozenBalance = null;
Long sleepUntilMessageTimestamp = resultSet.getLong(12);
Long sleepUntilMessageTimestamp = resultSet.getLong(13);
if (sleepUntilMessageTimestamp == 0 && resultSet.wasNull())
sleepUntilMessageTimestamp = null;
@@ -127,7 +127,7 @@ public class HSQLDBATRepository implements ATRepository {
if (frozenBalance == 0 && resultSet.wasNull())
frozenBalance = null;
Long sleepUntilMessageTimestamp = resultSet.getLong(12);
Long sleepUntilMessageTimestamp = resultSet.getLong(13);
if (sleepUntilMessageTimestamp == 0 && resultSet.wasNull())
sleepUntilMessageTimestamp = null;