From b3673999d48ef7af9ce2ff98ae891a0f9a66b9f4 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Sun, 22 Dec 2013 18:48:46 +0100 Subject: [PATCH] Move WalletTransaction into the wallet package. --- core/src/main/java/com/google/bitcoin/core/Wallet.java | 2 +- .../com/google/bitcoin/store/WalletProtobufSerializer.java | 1 + .../google/bitcoin/{core => wallet}/WalletTransaction.java | 4 +++- core/src/test/java/com/google/bitcoin/core/WalletTest.java | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) rename core/src/main/java/com/google/bitcoin/{core => wallet}/WalletTransaction.java (96%) diff --git a/core/src/main/java/com/google/bitcoin/core/Wallet.java b/core/src/main/java/com/google/bitcoin/core/Wallet.java index ab3caa56..27756eae 100644 --- a/core/src/main/java/com/google/bitcoin/core/Wallet.java +++ b/core/src/main/java/com/google/bitcoin/core/Wallet.java @@ -17,7 +17,7 @@ package com.google.bitcoin.core; import com.google.bitcoin.core.TransactionConfidence.ConfidenceType; -import com.google.bitcoin.core.WalletTransaction.Pool; +import com.google.bitcoin.wallet.WalletTransaction.Pool; import com.google.bitcoin.crypto.KeyCrypter; import com.google.bitcoin.crypto.KeyCrypterException; import com.google.bitcoin.crypto.KeyCrypterScrypt; diff --git a/core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java b/core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java index 745e62ed..6c01af78 100644 --- a/core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java +++ b/core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java @@ -22,6 +22,7 @@ import com.google.bitcoin.crypto.EncryptedPrivateKey; import com.google.bitcoin.crypto.KeyCrypter; import com.google.bitcoin.crypto.KeyCrypterScrypt; import com.google.bitcoin.script.Script; +import com.google.bitcoin.wallet.WalletTransaction; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; import com.google.protobuf.TextFormat; diff --git a/core/src/main/java/com/google/bitcoin/core/WalletTransaction.java b/core/src/main/java/com/google/bitcoin/wallet/WalletTransaction.java similarity index 96% rename from core/src/main/java/com/google/bitcoin/core/WalletTransaction.java rename to core/src/main/java/com/google/bitcoin/wallet/WalletTransaction.java index 75a6f8c9..9b68ad3e 100644 --- a/core/src/main/java/com/google/bitcoin/core/WalletTransaction.java +++ b/core/src/main/java/com/google/bitcoin/wallet/WalletTransaction.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.google.bitcoin.core; +package com.google.bitcoin.wallet; +import com.google.bitcoin.core.Transaction; + import static com.google.common.base.Preconditions.checkNotNull; /** diff --git a/core/src/test/java/com/google/bitcoin/core/WalletTest.java b/core/src/test/java/com/google/bitcoin/core/WalletTest.java index 359a1dee..f824e489 100644 --- a/core/src/test/java/com/google/bitcoin/core/WalletTest.java +++ b/core/src/test/java/com/google/bitcoin/core/WalletTest.java @@ -18,7 +18,8 @@ package com.google.bitcoin.core; import com.google.bitcoin.core.Transaction.SigHash; import com.google.bitcoin.core.Wallet.SendRequest; -import com.google.bitcoin.core.WalletTransaction.Pool; +import com.google.bitcoin.wallet.WalletTransaction; +import com.google.bitcoin.wallet.WalletTransaction.Pool; import com.google.bitcoin.crypto.KeyCrypter; import com.google.bitcoin.crypto.KeyCrypterException; import com.google.bitcoin.crypto.KeyCrypterScrypt;