diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java index a456de5a3..566df62a8 100644 --- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java +++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java @@ -3533,7 +3533,7 @@ public class Wallet extends BaseTaggableObject builder.append("\nKeys:\n"); builder.append("Earliest creation time: ").append(TimeUtils.dateTimeFormat(earliestKeyCreationTime())) .append('\n'); - final Optional keyRotationTime = getKeyRotationTimeInstant(); + final Optional keyRotationTime = keyRotationTime(); if (keyRotationTime.isPresent()) builder.append("Key rotation time: ").append(TimeUtils.dateTimeFormat(keyRotationTime.get())).append('\n'); builder.append(keyChainGroup.toString(includeLookahead, includePrivateKeys, aesKey)); @@ -5418,11 +5418,11 @@ public class Wallet extends BaseTaggableObject * Returns the key rotation time, or empty if unconfigured. See {@link #setKeyRotationTime(Instant)} for a description * of the field. */ - public Optional getKeyRotationTimeInstant() { + public Optional keyRotationTime() { return Optional.ofNullable(vKeyRotationTime); } - /** @deprecated use {@link #getKeyRotationTimeInstant()} */ + /** @deprecated use {@link #keyRotationTime()} */ @Deprecated public @Nullable Date getKeyRotationTime() { Instant keyRotationTime = vKeyRotationTime; diff --git a/core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java b/core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java index cddd6f908..31c47c2c6 100644 --- a/core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java +++ b/core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java @@ -221,7 +221,7 @@ public class WalletProtobufSerializer { } } - Optional keyRotationTime = wallet.getKeyRotationTimeInstant(); + Optional keyRotationTime = wallet.keyRotationTime(); if (keyRotationTime.isPresent()) { long timeSecs = keyRotationTime.get().getEpochSecond(); walletBuilder.setKeyRotationTime(timeSecs); diff --git a/core/src/test/java/org/bitcoinj/wallet/WalletTest.java b/core/src/test/java/org/bitcoinj/wallet/WalletTest.java index 8195d937d..da333d480 100644 --- a/core/src/test/java/org/bitcoinj/wallet/WalletTest.java +++ b/core/src/test/java/org/bitcoinj/wallet/WalletTest.java @@ -2966,7 +2966,7 @@ public class WalletTest extends TestWithWallet { Objects.requireNonNull(tx); assertEquals(Transaction.Purpose.KEY_ROTATION, tx.getPurpose()); // Have to divide here to avoid mismatch due to second-level precision in serialisation. - assertEquals(compromiseTime, wallet.getKeyRotationTimeInstant().get()); + assertEquals(compromiseTime, wallet.keyRotationTime().get()); // Make a normal spend and check it's all ok. wallet.sendCoins(broadcaster, OTHER_ADDRESS, wallet.getBalance());