From 577b63b682d7ed634304db49b3f8445b1bcc2fdb Mon Sep 17 00:00:00 2001 From: akibabu Date: Fri, 29 Mar 2019 20:30:39 +0900 Subject: [PATCH] move to other package --- .../bitcoin/{wallet => slpwallet}/Network.kt | 4 ++-- .../bitcoin/{wallet => slpwallet}/SLPWallet.kt | 12 ++++++------ .../{wallet => slpwallet}/SLPWalletConfig.kt | 2 +- .../{wallet => slpwallet}/TaskScheduler.kt | 2 +- .../{wallet => slpwallet}/WalletBalance.kt | 4 ++-- .../{wallet => slpwallet}/WalletService.kt | 4 ++-- .../{wallet => slpwallet}/WalletServiceImpl.kt | 18 +++++++++--------- .../{wallet => slpwallet}/address/Address.kt | 6 +++--- .../address/AddressCash.kt | 6 +++--- .../address/AddressFormatException.kt | 2 +- .../address/AddressLegacy.kt | 4 ++-- .../address/AddressSLP.kt | 6 +++--- .../address/AddressType.java | 2 +- .../address/KeyAddressPair.kt | 2 +- .../bitcoinj/AddressCashUtil.java | 2 +- .../bitcoinj/AddressCashValidator.java | 4 ++-- .../{wallet => slpwallet}/bitcoinj/Mnemonic.kt | 8 ++++---- .../bitcoinj/NetworkInstance.kt | 4 ++-- .../encoding/Base58CheckEncoding.kt | 2 +- .../encoding/ByteUtils.kt | 2 +- .../encoding/Sha256Hash.kt | 2 +- .../persistence/DaoBase.kt | 2 +- .../persistence/SlpTokenBalance.kt | 2 +- .../persistence/SlpTokenBalanceDao.kt | 2 +- .../persistence/TypeConverters.kt | 4 ++-- .../persistence/WalletDatabase.kt | 10 +++++----- .../persistence/WalletDatabaseImpl.kt | 12 ++++++------ .../presentation/BalanceInfo.kt | 2 +- .../presentation/BalanceInfoImpl.kt | 4 ++-- .../presentation/Blockie.kt | 2 +- .../presentation/ProgressTask.kt | 2 +- .../presentation/TokenNumberFormat.kt | 2 +- .../rest/AddressUtxosRequest.kt | 4 ++-- .../rest/AddressUtxosResponse.kt | 2 +- .../rest/BitcoinRestClient.kt | 4 ++-- .../{wallet => slpwallet}/rest/Retrofit.kt | 6 +++--- .../rest/SlpValidateTxRequest.kt | 2 +- .../rest/SlpValidateTxResponse.kt | 2 +- .../rest/TxDetailsRequest.kt | 2 +- .../{wallet => slpwallet}/rest/TxResponse.kt | 2 +- .../{wallet => slpwallet}/slp/SLPWalletImpl.kt | 16 ++++++++-------- .../{wallet => slpwallet}/slp/SlpOpReturn.kt | 6 +++--- .../slp/SlpOpReturnGenesis.kt | 6 +++--- .../slp/SlpOpReturnMint.kt | 6 +++--- .../slp/SlpOpReturnSend.kt | 4 ++-- .../slp/SlpTokenDetails.kt | 2 +- .../slp/SlpTokenDetailsDao.kt | 4 ++-- .../slp/SlpTokenDetailsFacade.kt | 6 +++--- .../{wallet => slpwallet}/slp/SlpTokenId.kt | 4 ++-- .../{wallet => slpwallet}/slp/SlpTokenType.kt | 4 ++-- .../slp/SlpTransactionType.kt | 2 +- .../{wallet => slpwallet}/slp/SlpUtxo.kt | 4 ++-- .../{wallet => slpwallet}/slp/SlpUtxoDao.kt | 4 ++-- .../{wallet => slpwallet}/slp/SlpValidTx.kt | 2 +- .../{wallet => slpwallet}/slp/SlpValidTxDao.kt | 4 ++-- .../bitcoin/{wallet => slpwallet}/tx/Script.kt | 2 +- .../{wallet => slpwallet}/tx/TxBuilder.kt | 10 +++++----- .../bitcoin/{wallet => slpwallet}/tx/Utxo.kt | 4 ++-- .../{wallet => slpwallet}/tx/UtxoDao.kt | 4 ++-- .../{wallet => slpwallet}/tx/UtxoFacade.kt | 6 +++--- .../util/SingletonHolder.kt | 2 +- .../util/TaskScheduler.kt | 2 +- .../WalletDatabaseInMemory.kt | 16 ++++++++-------- .../WalletServiceImplTest.kt | 16 ++++++++-------- .../address/AddressCashTest.kt | 4 ++-- .../address/AddressSLPTest.kt | 4 ++-- .../bitcoinj/MnemonicTest.kt | 6 +++--- .../rest/BitcoinRestClientMock.kt | 12 ++++++------ .../rest/BitcoinRestClientMockAarAngBch.kt | 10 +++++----- .../rest/BitcoinRestClientMockAarBch.kt | 10 +++++----- .../slp/SlpOpReturnTest.kt | 4 ++-- .../slp/SlpTokenDetailsTest.kt | 2 +- 72 files changed, 177 insertions(+), 177 deletions(-) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/Network.kt (64%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/SLPWallet.kt (92%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/SLPWalletConfig.kt (67%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/TaskScheduler.kt (99%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/WalletBalance.kt (67%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/WalletService.kt (92%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/WalletServiceImpl.kt (95%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/address/Address.kt (93%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/address/AddressCash.kt (89%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/address/AddressFormatException.kt (74%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/address/AddressLegacy.kt (91%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/address/AddressSLP.kt (89%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/address/AddressType.java (93%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/address/KeyAddressPair.kt (78%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/bitcoinj/AddressCashUtil.java (99%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/bitcoinj/AddressCashValidator.java (94%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/bitcoinj/Mnemonic.kt (89%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/bitcoinj/NetworkInstance.kt (81%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/encoding/Base58CheckEncoding.kt (96%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/encoding/ByteUtils.kt (96%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/encoding/Sha256Hash.kt (93%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/persistence/DaoBase.kt (87%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/persistence/SlpTokenBalance.kt (89%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/persistence/SlpTokenBalanceDao.kt (93%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/persistence/TypeConverters.kt (88%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/persistence/WalletDatabase.kt (58%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/persistence/WalletDatabaseImpl.kt (86%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/presentation/BalanceInfo.kt (80%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/presentation/BalanceInfoImpl.kt (86%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/presentation/Blockie.kt (84%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/presentation/ProgressTask.kt (94%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/presentation/TokenNumberFormat.kt (94%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/rest/AddressUtxosRequest.kt (75%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/rest/AddressUtxosResponse.kt (92%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/rest/BitcoinRestClient.kt (94%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/rest/Retrofit.kt (92%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/rest/SlpValidateTxRequest.kt (80%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/rest/SlpValidateTxResponse.kt (82%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/rest/TxDetailsRequest.kt (80%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/rest/TxResponse.kt (90%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SLPWalletImpl.kt (94%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpOpReturn.kt (95%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpOpReturnGenesis.kt (90%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpOpReturnMint.kt (82%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpOpReturnSend.kt (96%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpTokenDetails.kt (97%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpTokenDetailsDao.kt (78%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpTokenDetailsFacade.kt (92%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpTokenId.kt (84%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpTokenType.kt (88%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpTransactionType.kt (93%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpUtxo.kt (84%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpUtxoDao.kt (83%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpValidTx.kt (89%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/slp/SlpValidTxDao.kt (76%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/tx/Script.kt (93%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/tx/TxBuilder.kt (93%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/tx/Utxo.kt (86%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/tx/UtxoDao.kt (82%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/tx/UtxoFacade.kt (98%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/util/SingletonHolder.kt (94%) rename slpwallet/src/main/java/com/bitcoin/{wallet => slpwallet}/util/TaskScheduler.kt (98%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/WalletDatabaseInMemory.kt (90%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/WalletServiceImplTest.kt (95%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/address/AddressCashTest.kt (95%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/address/AddressSLPTest.kt (95%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/bitcoinj/MnemonicTest.kt (89%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/rest/BitcoinRestClientMock.kt (89%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/rest/BitcoinRestClientMockAarAngBch.kt (90%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/rest/BitcoinRestClientMockAarBch.kt (89%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/slp/SlpOpReturnTest.kt (97%) rename slpwallet/src/test/java/com/bitcoin/{wallet => slpwallet}/slp/SlpTokenDetailsTest.kt (98%) diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/Network.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/Network.kt similarity index 64% rename from slpwallet/src/main/java/com/bitcoin/wallet/Network.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/Network.kt index 0211657..16a2469 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/Network.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/Network.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet +package com.bitcoin.slpwallet -import com.bitcoin.wallet.bitcoinj.NetworkInstance +import com.bitcoin.slpwallet.bitcoinj.NetworkInstance /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/SLPWallet.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/SLPWallet.kt similarity index 92% rename from slpwallet/src/main/java/com/bitcoin/wallet/SLPWallet.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/SLPWallet.kt index 7cd28d9..fb20bb3 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/SLPWallet.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/SLPWallet.kt @@ -1,13 +1,13 @@ -package com.bitcoin.wallet +package com.bitcoin.slpwallet import android.content.Context import androidx.lifecycle.LiveData import com.bitcoin.securepreferences.SecurePreferences -import com.bitcoin.wallet.bitcoinj.Mnemonic -import com.bitcoin.wallet.persistence.WalletDatabaseImpl -import com.bitcoin.wallet.presentation.BalanceInfo -import com.bitcoin.wallet.presentation.ProgressTask -import com.bitcoin.wallet.slp.SLPWalletImpl +import com.bitcoin.slpwallet.bitcoinj.Mnemonic +import com.bitcoin.slpwallet.persistence.WalletDatabaseImpl +import com.bitcoin.slpwallet.presentation.BalanceInfo +import com.bitcoin.slpwallet.presentation.ProgressTask +import com.bitcoin.slpwallet.slp.SLPWalletImpl import io.reactivex.Single import timber.log.Timber import java.math.BigDecimal diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/SLPWalletConfig.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/SLPWalletConfig.kt similarity index 67% rename from slpwallet/src/main/java/com/bitcoin/wallet/SLPWalletConfig.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/SLPWalletConfig.kt index b68e16b..7f94bba 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/SLPWalletConfig.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/SLPWalletConfig.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet +package com.bitcoin.slpwallet object SLPWalletConfig { var restAPIKey: String? = null diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/TaskScheduler.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/TaskScheduler.kt similarity index 99% rename from slpwallet/src/main/java/com/bitcoin/wallet/TaskScheduler.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/TaskScheduler.kt index a38396f..564a6a9 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/TaskScheduler.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/TaskScheduler.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet +package com.bitcoin.slpwallet /* * Copyright 2018 Google LLC diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/WalletBalance.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/WalletBalance.kt similarity index 67% rename from slpwallet/src/main/java/com/bitcoin/wallet/WalletBalance.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/WalletBalance.kt index 3df7449..d08c2ec 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/WalletBalance.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/WalletBalance.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet +package com.bitcoin.slpwallet -import com.bitcoin.wallet.slp.SlpTokenDetails +import com.bitcoin.slpwallet.slp.SlpTokenDetails import java.math.BigDecimal /** diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/WalletService.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/WalletService.kt similarity index 92% rename from slpwallet/src/main/java/com/bitcoin/wallet/WalletService.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/WalletService.kt index 4f7c7fc..6965b90 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/WalletService.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/WalletService.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet +package com.bitcoin.slpwallet -import com.bitcoin.wallet.slp.SlpTokenId +import com.bitcoin.slpwallet.slp.SlpTokenId import io.reactivex.Single import java.math.BigDecimal diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/WalletServiceImpl.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/WalletServiceImpl.kt similarity index 95% rename from slpwallet/src/main/java/com/bitcoin/wallet/WalletServiceImpl.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/WalletServiceImpl.kt index 4b720b9..fda3431 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/WalletServiceImpl.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/WalletServiceImpl.kt @@ -1,12 +1,12 @@ -package com.bitcoin.wallet - -import com.bitcoin.wallet.address.AddressSLP -import com.bitcoin.wallet.persistence.WalletDatabase -import com.bitcoin.wallet.rest.BitcoinRestClient -import com.bitcoin.wallet.slp.* -import com.bitcoin.wallet.tx.TxBuilder -import com.bitcoin.wallet.tx.Utxo -import com.bitcoin.wallet.tx.UtxoFacade +package com.bitcoin.slpwallet + +import com.bitcoin.slpwallet.address.AddressSLP +import com.bitcoin.slpwallet.persistence.WalletDatabase +import com.bitcoin.slpwallet.rest.BitcoinRestClient +import com.bitcoin.slpwallet.slp.* +import com.bitcoin.slpwallet.tx.TxBuilder +import com.bitcoin.slpwallet.tx.Utxo +import com.bitcoin.slpwallet.tx.UtxoFacade import com.google.gson.JsonParser import io.reactivex.Single import timber.log.Timber diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/address/Address.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/Address.kt similarity index 93% rename from slpwallet/src/main/java/com/bitcoin/wallet/address/Address.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/address/Address.kt index a6017ee..814c633 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/address/Address.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/Address.kt @@ -1,8 +1,8 @@ -package com.bitcoin.wallet.address +package com.bitcoin.slpwallet.address -import com.bitcoin.wallet.Network -import com.bitcoin.wallet.encoding.Base58CheckEncoding +import com.bitcoin.slpwallet.Network +import com.bitcoin.slpwallet.encoding.Base58CheckEncoding /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressCash.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressCash.kt similarity index 89% rename from slpwallet/src/main/java/com/bitcoin/wallet/address/AddressCash.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressCash.kt index a9fe15a..3a6d0cd 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressCash.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressCash.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.address +package com.bitcoin.slpwallet.address -import com.bitcoin.wallet.Network -import com.bitcoin.wallet.bitcoinj.AddressCashUtil +import com.bitcoin.slpwallet.Network +import com.bitcoin.slpwallet.bitcoinj.AddressCashUtil /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressFormatException.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressFormatException.kt similarity index 74% rename from slpwallet/src/main/java/com/bitcoin/wallet/address/AddressFormatException.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressFormatException.kt index fbf5fa9..cd0dbe3 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressFormatException.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressFormatException.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.address +package com.bitcoin.slpwallet.address /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressLegacy.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressLegacy.kt similarity index 91% rename from slpwallet/src/main/java/com/bitcoin/wallet/address/AddressLegacy.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressLegacy.kt index 5ac6e39..cb515d6 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressLegacy.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressLegacy.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.address +package com.bitcoin.slpwallet.address -import com.bitcoin.wallet.Network +import com.bitcoin.slpwallet.Network /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressSLP.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressSLP.kt similarity index 89% rename from slpwallet/src/main/java/com/bitcoin/wallet/address/AddressSLP.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressSLP.kt index ea71a72..3841c43 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressSLP.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressSLP.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.address +package com.bitcoin.slpwallet.address -import com.bitcoin.wallet.Network -import com.bitcoin.wallet.bitcoinj.AddressCashUtil +import com.bitcoin.slpwallet.Network +import com.bitcoin.slpwallet.bitcoinj.AddressCashUtil /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressType.java b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressType.java similarity index 93% rename from slpwallet/src/main/java/com/bitcoin/wallet/address/AddressType.java rename to slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressType.java index bc13e59..23df906 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/address/AddressType.java +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/AddressType.java @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.address; +package com.bitcoin.slpwallet.address; /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/address/KeyAddressPair.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/KeyAddressPair.kt similarity index 78% rename from slpwallet/src/main/java/com/bitcoin/wallet/address/KeyAddressPair.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/address/KeyAddressPair.kt index 78b0c75..f411350 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/address/KeyAddressPair.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/address/KeyAddressPair.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.address +package com.bitcoin.slpwallet.address import java.math.BigInteger diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/AddressCashUtil.java b/slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/AddressCashUtil.java similarity index 99% rename from slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/AddressCashUtil.java rename to slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/AddressCashUtil.java index 9015a4e..3aa7a65 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/AddressCashUtil.java +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/AddressCashUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.bitcoin.wallet.bitcoinj; +package com.bitcoin.slpwallet.bitcoinj; import org.bitcoinj.core.AddressFormatException; diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/AddressCashValidator.java b/slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/AddressCashValidator.java similarity index 94% rename from slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/AddressCashValidator.java rename to slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/AddressCashValidator.java index 5b4d3fa..ff040dd 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/AddressCashValidator.java +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/AddressCashValidator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.bitcoin.wallet.bitcoinj; +package com.bitcoin.slpwallet.bitcoinj; -import com.bitcoin.wallet.address.AddressFormatException; +import com.bitcoin.slpwallet.address.AddressFormatException; /** * From BitcoinJ diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/Mnemonic.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/Mnemonic.kt similarity index 89% rename from slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/Mnemonic.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/Mnemonic.kt index dfb492a..79c4476 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/Mnemonic.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/Mnemonic.kt @@ -1,8 +1,8 @@ -package com.bitcoin.wallet.bitcoinj +package com.bitcoin.slpwallet.bitcoinj -import com.bitcoin.wallet.Network -import com.bitcoin.wallet.address.Address -import com.bitcoin.wallet.address.KeyAddressPair +import com.bitcoin.slpwallet.Network +import com.bitcoin.slpwallet.address.Address +import com.bitcoin.slpwallet.address.KeyAddressPair import org.bitcoinj.crypto.ChildNumber import org.bitcoinj.crypto.HDKeyDerivation import org.bitcoinj.crypto.MnemonicCode diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/NetworkInstance.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/NetworkInstance.kt similarity index 81% rename from slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/NetworkInstance.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/NetworkInstance.kt index c78a43a..4728ebf 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/bitcoinj/NetworkInstance.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/bitcoinj/NetworkInstance.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.bitcoinj +package com.bitcoin.slpwallet.bitcoinj -import com.bitcoin.wallet.Network +import com.bitcoin.slpwallet.Network import org.bitcoinj.core.NetworkParameters import org.bitcoinj.params.MainNetParams import org.bitcoinj.params.TestNet3Params diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/encoding/Base58CheckEncoding.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/encoding/Base58CheckEncoding.kt similarity index 96% rename from slpwallet/src/main/java/com/bitcoin/wallet/encoding/Base58CheckEncoding.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/encoding/Base58CheckEncoding.kt index 6414bae..35d81f3 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/encoding/Base58CheckEncoding.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/encoding/Base58CheckEncoding.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.encoding +package com.bitcoin.slpwallet.encoding /** * https://github.com/bitcoinbook/bitcoinbook/blob/develop/images/mbc2_0406.png diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/encoding/ByteUtils.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/encoding/ByteUtils.kt similarity index 96% rename from slpwallet/src/main/java/com/bitcoin/wallet/encoding/ByteUtils.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/encoding/ByteUtils.kt index 0e112c8..f59dc31 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/encoding/ByteUtils.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/encoding/ByteUtils.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.encoding +package com.bitcoin.slpwallet.encoding import org.spongycastle.util.encoders.DecoderException import java.nio.ByteBuffer diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/encoding/Sha256Hash.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/encoding/Sha256Hash.kt similarity index 93% rename from slpwallet/src/main/java/com/bitcoin/wallet/encoding/Sha256Hash.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/encoding/Sha256Hash.kt index 441761f..afd3469 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/encoding/Sha256Hash.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/encoding/Sha256Hash.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.encoding +package com.bitcoin.slpwallet.encoding import java.security.MessageDigest import java.security.NoSuchAlgorithmException diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/DaoBase.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/DaoBase.kt similarity index 87% rename from slpwallet/src/main/java/com/bitcoin/wallet/persistence/DaoBase.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/DaoBase.kt index d7bb349..34578db 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/DaoBase.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/DaoBase.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.persistence +package com.bitcoin.slpwallet.persistence import androidx.room.Insert import androidx.room.OnConflictStrategy diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/SlpTokenBalance.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/SlpTokenBalance.kt similarity index 89% rename from slpwallet/src/main/java/com/bitcoin/wallet/persistence/SlpTokenBalance.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/SlpTokenBalance.kt index 8904d88..8895c2c 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/SlpTokenBalance.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/SlpTokenBalance.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.persistence +package com.bitcoin.slpwallet.persistence import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/SlpTokenBalanceDao.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/SlpTokenBalanceDao.kt similarity index 93% rename from slpwallet/src/main/java/com/bitcoin/wallet/persistence/SlpTokenBalanceDao.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/SlpTokenBalanceDao.kt index 4074cad..25e7d16 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/SlpTokenBalanceDao.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/SlpTokenBalanceDao.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.persistence +package com.bitcoin.slpwallet.persistence import androidx.lifecycle.LiveData import androidx.room.Dao diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/TypeConverters.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/TypeConverters.kt similarity index 88% rename from slpwallet/src/main/java/com/bitcoin/wallet/persistence/TypeConverters.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/TypeConverters.kt index db00334..7d76c7a 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/TypeConverters.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/TypeConverters.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.persistence +package com.bitcoin.slpwallet.persistence import androidx.room.TypeConverter -import com.bitcoin.wallet.slp.SlpTokenId +import com.bitcoin.slpwallet.slp.SlpTokenId import java.math.BigDecimal class TypeConverters { diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/WalletDatabase.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/WalletDatabase.kt similarity index 58% rename from slpwallet/src/main/java/com/bitcoin/wallet/persistence/WalletDatabase.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/WalletDatabase.kt index d4c2fe2..eafee4c 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/WalletDatabase.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/WalletDatabase.kt @@ -1,9 +1,9 @@ -package com.bitcoin.wallet.persistence +package com.bitcoin.slpwallet.persistence -import com.bitcoin.wallet.slp.SlpTokenDetailsDao -import com.bitcoin.wallet.slp.SlpUtxoDao -import com.bitcoin.wallet.slp.SlpValidTxDao -import com.bitcoin.wallet.tx.UtxoDao +import com.bitcoin.slpwallet.slp.SlpTokenDetailsDao +import com.bitcoin.slpwallet.slp.SlpUtxoDao +import com.bitcoin.slpwallet.slp.SlpValidTxDao +import com.bitcoin.slpwallet.tx.UtxoDao /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/WalletDatabaseImpl.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/WalletDatabaseImpl.kt similarity index 86% rename from slpwallet/src/main/java/com/bitcoin/wallet/persistence/WalletDatabaseImpl.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/WalletDatabaseImpl.kt index 83eb12c..6bc0a1c 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/persistence/WalletDatabaseImpl.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/persistence/WalletDatabaseImpl.kt @@ -1,21 +1,21 @@ -package com.bitcoin.wallet.persistence +package com.bitcoin.slpwallet.persistence import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters -import com.bitcoin.wallet.slp.* -import com.bitcoin.wallet.tx.Utxo -import com.bitcoin.wallet.tx.UtxoDao -import com.bitcoin.wallet.util.SingletonHolder +import com.bitcoin.slpwallet.slp.* +import com.bitcoin.slpwallet.tx.Utxo +import com.bitcoin.slpwallet.tx.UtxoDao +import com.bitcoin.slpwallet.util.SingletonHolder import io.reactivex.schedulers.Schedulers import timber.log.Timber import java.util.concurrent.atomic.AtomicBoolean @Database(entities = [SlpTokenBalance::class, Utxo::class, SlpUtxo::class, SlpTokenDetails::class, SlpValidTx::class], version = 5) -@TypeConverters(com.bitcoin.wallet.persistence.TypeConverters::class) +@TypeConverters(com.bitcoin.slpwallet.persistence.TypeConverters::class) internal abstract class WalletDatabaseImpl : RoomDatabase(), WalletDatabase { private var initialized = AtomicBoolean(true) diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/BalanceInfo.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/BalanceInfo.kt similarity index 80% rename from slpwallet/src/main/java/com/bitcoin/wallet/presentation/BalanceInfo.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/BalanceInfo.kt index dc3cc46..4822f34 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/BalanceInfo.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/BalanceInfo.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.presentation +package com.bitcoin.slpwallet.presentation import java.math.BigDecimal diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/BalanceInfoImpl.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/BalanceInfoImpl.kt similarity index 86% rename from slpwallet/src/main/java/com/bitcoin/wallet/presentation/BalanceInfoImpl.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/BalanceInfoImpl.kt index 6fe174b..d2c2172 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/BalanceInfoImpl.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/BalanceInfoImpl.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.presentation +package com.bitcoin.slpwallet.presentation -import com.bitcoin.wallet.persistence.SlpTokenBalance +import com.bitcoin.slpwallet.persistence.SlpTokenBalance import java.math.BigDecimal data class BalanceInfoImpl( diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/Blockie.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/Blockie.kt similarity index 84% rename from slpwallet/src/main/java/com/bitcoin/wallet/presentation/Blockie.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/Blockie.kt index ca8583f..f6ecd69 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/Blockie.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/Blockie.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.presentation +package com.bitcoin.slpwallet.presentation /** * Because of bug in Badger Wallet expecting the token ID to be an address prefixed with "bitcoincash:" diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/ProgressTask.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/ProgressTask.kt similarity index 94% rename from slpwallet/src/main/java/com/bitcoin/wallet/presentation/ProgressTask.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/ProgressTask.kt index d5a702e..27c29a7 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/ProgressTask.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/ProgressTask.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.presentation +package com.bitcoin.slpwallet.presentation enum class TaskStatus { IDLE, diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/TokenNumberFormat.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/TokenNumberFormat.kt similarity index 94% rename from slpwallet/src/main/java/com/bitcoin/wallet/presentation/TokenNumberFormat.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/TokenNumberFormat.kt index c8d750d..f301c9a 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/presentation/TokenNumberFormat.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/presentation/TokenNumberFormat.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.presentation +package com.bitcoin.slpwallet.presentation import java.text.DecimalFormat import java.text.DecimalFormatSymbols diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/rest/AddressUtxosRequest.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/AddressUtxosRequest.kt similarity index 75% rename from slpwallet/src/main/java/com/bitcoin/wallet/rest/AddressUtxosRequest.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/rest/AddressUtxosRequest.kt index a4af9ff..7fb7230 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/rest/AddressUtxosRequest.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/AddressUtxosRequest.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest -import com.bitcoin.wallet.address.AddressCash +import com.bitcoin.slpwallet.address.AddressCash /** * https://rest.bitcoin.com/#/address/utxoBulk diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/rest/AddressUtxosResponse.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/AddressUtxosResponse.kt similarity index 92% rename from slpwallet/src/main/java/com/bitcoin/wallet/rest/AddressUtxosResponse.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/rest/AddressUtxosResponse.kt index 30017df..96a6114 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/rest/AddressUtxosResponse.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/AddressUtxosResponse.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest /** * https://rest.bitcoin.com/#/address/utxoBulk diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/rest/BitcoinRestClient.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/BitcoinRestClient.kt similarity index 94% rename from slpwallet/src/main/java/com/bitcoin/wallet/rest/BitcoinRestClient.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/rest/BitcoinRestClient.kt index 5cd653f..8889b9c 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/rest/BitcoinRestClient.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/BitcoinRestClient.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest -import com.bitcoin.wallet.Network +import com.bitcoin.slpwallet.Network import io.reactivex.Single import retrofit2.http.Body import retrofit2.http.GET diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/rest/Retrofit.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/Retrofit.kt similarity index 92% rename from slpwallet/src/main/java/com/bitcoin/wallet/rest/Retrofit.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/rest/Retrofit.kt index d07f64b..12ad769 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/rest/Retrofit.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/Retrofit.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest -import com.bitcoin.wallet.Network -import com.bitcoin.wallet.SLPWalletConfig +import com.bitcoin.slpwallet.Network +import com.bitcoin.slpwallet.SLPWalletConfig import okhttp3.OkHttpClient import retrofit2.Retrofit import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/rest/SlpValidateTxRequest.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/SlpValidateTxRequest.kt similarity index 80% rename from slpwallet/src/main/java/com/bitcoin/wallet/rest/SlpValidateTxRequest.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/rest/SlpValidateTxRequest.kt index fd8923b..531052b 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/rest/SlpValidateTxRequest.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/SlpValidateTxRequest.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest /** * https://rest.bitcoin.com/#/slp/validateTxidBulk diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/rest/SlpValidateTxResponse.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/SlpValidateTxResponse.kt similarity index 82% rename from slpwallet/src/main/java/com/bitcoin/wallet/rest/SlpValidateTxResponse.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/rest/SlpValidateTxResponse.kt index 51e5c23..3bb0fb8 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/rest/SlpValidateTxResponse.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/SlpValidateTxResponse.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest /** * https://rest.bitcoin.com/#/slp/validateTxidBulk diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/rest/TxDetailsRequest.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/TxDetailsRequest.kt similarity index 80% rename from slpwallet/src/main/java/com/bitcoin/wallet/rest/TxDetailsRequest.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/rest/TxDetailsRequest.kt index 1b310f6..cc91d29 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/rest/TxDetailsRequest.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/TxDetailsRequest.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest /** * https://rest.bitcoin.com/v2/transaction/details diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/rest/TxResponse.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/TxResponse.kt similarity index 90% rename from slpwallet/src/main/java/com/bitcoin/wallet/rest/TxResponse.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/rest/TxResponse.kt index 364477b..b35e01b 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/rest/TxResponse.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/rest/TxResponse.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest /** * https://rest.bitcoin.com/v2/transaction/details diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SLPWalletImpl.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SLPWalletImpl.kt similarity index 94% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SLPWalletImpl.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SLPWalletImpl.kt index 3e22c83..cac01b9 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SLPWalletImpl.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SLPWalletImpl.kt @@ -1,15 +1,15 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations -import com.bitcoin.wallet.* -import com.bitcoin.wallet.bitcoinj.Mnemonic -import com.bitcoin.wallet.persistence.SlpTokenBalance -import com.bitcoin.wallet.persistence.WalletDatabase -import com.bitcoin.wallet.presentation.BalanceInfo -import com.bitcoin.wallet.presentation.BalanceInfoImpl -import com.bitcoin.wallet.presentation.ProgressTask +import com.bitcoin.slpwallet.* +import com.bitcoin.slpwallet.bitcoinj.Mnemonic +import com.bitcoin.slpwallet.persistence.SlpTokenBalance +import com.bitcoin.slpwallet.persistence.WalletDatabase +import com.bitcoin.slpwallet.presentation.BalanceInfo +import com.bitcoin.slpwallet.presentation.BalanceInfoImpl +import com.bitcoin.slpwallet.presentation.ProgressTask import io.reactivex.Single import io.reactivex.schedulers.Schedulers import timber.log.Timber diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturn.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturn.kt similarity index 95% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturn.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturn.kt index 1a7dcee..42024af 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturn.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturn.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp -import com.bitcoin.wallet.encoding.ByteUtils -import com.bitcoin.wallet.tx.Script +import com.bitcoin.slpwallet.encoding.ByteUtils +import com.bitcoin.slpwallet.tx.Script import java.util.* /** diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturnGenesis.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturnGenesis.kt similarity index 90% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturnGenesis.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturnGenesis.kt index cc60b27..76a205e 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturnGenesis.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturnGenesis.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp -import com.bitcoin.wallet.encoding.ByteUtils -import com.bitcoin.wallet.slp.SlpOpReturn.BatonAndMint +import com.bitcoin.slpwallet.encoding.ByteUtils +import com.bitcoin.slpwallet.slp.SlpOpReturn.BatonAndMint /** * Except for containing token details a GENESIS transaction works exactly like MINT diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturnMint.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturnMint.kt similarity index 82% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturnMint.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturnMint.kt index f57e8dd..d0864aa 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturnMint.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturnMint.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp -import com.bitcoin.wallet.encoding.ByteUtils -import com.bitcoin.wallet.slp.SlpOpReturn.BatonAndMint +import com.bitcoin.slpwallet.encoding.ByteUtils +import com.bitcoin.slpwallet.slp.SlpOpReturn.BatonAndMint /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturnSend.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturnSend.kt similarity index 96% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturnSend.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturnSend.kt index 866ea7b..b7f03a3 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpOpReturnSend.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpOpReturnSend.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp -import com.bitcoin.wallet.encoding.ByteUtils +import com.bitcoin.slpwallet.encoding.ByteUtils import org.bitcoinj.script.ScriptBuilder import org.bitcoinj.script.ScriptChunk import org.bitcoinj.script.ScriptOpCodes diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenDetails.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenDetails.kt similarity index 97% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenDetails.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenDetails.kt index 5d6d953..969c10c 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenDetails.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenDetails.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenDetailsDao.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenDetailsDao.kt similarity index 78% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenDetailsDao.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenDetailsDao.kt index 78f2011..9209310 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenDetailsDao.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenDetailsDao.kt @@ -1,8 +1,8 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp import androidx.room.Dao import androidx.room.Query -import com.bitcoin.wallet.persistence.DaoBase +import com.bitcoin.slpwallet.persistence.DaoBase /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenDetailsFacade.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenDetailsFacade.kt similarity index 92% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenDetailsFacade.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenDetailsFacade.kt index e6fac84..eccac84 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenDetailsFacade.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenDetailsFacade.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp -import com.bitcoin.wallet.rest.BitcoinRestClient -import com.bitcoin.wallet.rest.TxDetailsRequest +import com.bitcoin.slpwallet.rest.BitcoinRestClient +import com.bitcoin.slpwallet.rest.TxDetailsRequest import io.reactivex.Flowable import io.reactivex.Single import timber.log.Timber diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenId.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenId.kt similarity index 84% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenId.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenId.kt index f2eeb72..c920f15 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenId.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenId.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp -import com.bitcoin.wallet.encoding.ByteUtils +import com.bitcoin.slpwallet.encoding.ByteUtils /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenType.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenType.kt similarity index 88% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenType.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenType.kt index c376aa8..af5a607 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTokenType.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTokenType.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp -import com.bitcoin.wallet.encoding.ByteUtils +import com.bitcoin.slpwallet.encoding.ByteUtils /** * 1 to 2 byte integer diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTransactionType.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTransactionType.kt similarity index 93% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTransactionType.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTransactionType.kt index 32ee1a7..7ddb0b1 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpTransactionType.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpTransactionType.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp /** * Minimum 4 bytes ASCII diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpUtxo.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpUtxo.kt similarity index 84% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpUtxo.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpUtxo.kt index 3940706..246829c 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpUtxo.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpUtxo.kt @@ -1,9 +1,9 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp import androidx.room.ColumnInfo import androidx.room.Embedded import androidx.room.Entity -import com.bitcoin.wallet.tx.Utxo +import com.bitcoin.slpwallet.tx.Utxo import java.math.BigDecimal /** diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpUtxoDao.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpUtxoDao.kt similarity index 83% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpUtxoDao.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpUtxoDao.kt index 455b59d..18cf7f9 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpUtxoDao.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpUtxoDao.kt @@ -1,8 +1,8 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp import androidx.room.Dao import androidx.room.Query -import com.bitcoin.wallet.persistence.DaoBase +import com.bitcoin.slpwallet.persistence.DaoBase /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpValidTx.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpValidTx.kt similarity index 89% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpValidTx.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpValidTx.kt index 23a240b..6d4737e 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpValidTx.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpValidTx.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpValidTxDao.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpValidTxDao.kt similarity index 76% rename from slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpValidTxDao.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpValidTxDao.kt index 0011012..967b633 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/slp/SlpValidTxDao.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/slp/SlpValidTxDao.kt @@ -1,8 +1,8 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp import androidx.room.Dao import androidx.room.Query -import com.bitcoin.wallet.persistence.DaoBase +import com.bitcoin.slpwallet.persistence.DaoBase /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/tx/Script.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/Script.kt similarity index 93% rename from slpwallet/src/main/java/com/bitcoin/wallet/tx/Script.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/tx/Script.kt index 1f64f15..2f57bc7 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/tx/Script.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/Script.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.tx +package com.bitcoin.slpwallet.tx /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/tx/TxBuilder.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/TxBuilder.kt similarity index 93% rename from slpwallet/src/main/java/com/bitcoin/wallet/tx/TxBuilder.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/tx/TxBuilder.kt index 1987e28..ccea8c4 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/tx/TxBuilder.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/TxBuilder.kt @@ -1,9 +1,9 @@ -package com.bitcoin.wallet.tx +package com.bitcoin.slpwallet.tx -import com.bitcoin.wallet.address.Address -import com.bitcoin.wallet.encoding.ByteUtils -import com.bitcoin.wallet.slp.SLPWalletImpl -import com.bitcoin.wallet.slp.SlpOpReturnSend +import com.bitcoin.slpwallet.address.Address +import com.bitcoin.slpwallet.encoding.ByteUtils +import com.bitcoin.slpwallet.slp.SLPWalletImpl +import com.bitcoin.slpwallet.slp.SlpOpReturnSend import org.bitcoinj.core.* import org.bitcoinj.core.Transaction.SigHash import org.bitcoinj.script.Script diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/tx/Utxo.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/Utxo.kt similarity index 86% rename from slpwallet/src/main/java/com/bitcoin/wallet/tx/Utxo.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/tx/Utxo.kt index eaeed4b..0ed2013 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/tx/Utxo.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/Utxo.kt @@ -1,8 +1,8 @@ -package com.bitcoin.wallet.tx +package com.bitcoin.slpwallet.tx import androidx.room.ColumnInfo import androidx.room.Entity -import com.bitcoin.wallet.encoding.ByteUtils +import com.bitcoin.slpwallet.encoding.ByteUtils /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/tx/UtxoDao.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/UtxoDao.kt similarity index 82% rename from slpwallet/src/main/java/com/bitcoin/wallet/tx/UtxoDao.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/tx/UtxoDao.kt index 9091119..e2595b9 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/tx/UtxoDao.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/UtxoDao.kt @@ -1,8 +1,8 @@ -package com.bitcoin.wallet.tx +package com.bitcoin.slpwallet.tx import androidx.room.Dao import androidx.room.Query -import com.bitcoin.wallet.persistence.DaoBase +import com.bitcoin.slpwallet.persistence.DaoBase /** * @author akibabu diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/tx/UtxoFacade.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/UtxoFacade.kt similarity index 98% rename from slpwallet/src/main/java/com/bitcoin/wallet/tx/UtxoFacade.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/tx/UtxoFacade.kt index 40033f8..a53e618 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/tx/UtxoFacade.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/tx/UtxoFacade.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.tx +package com.bitcoin.slpwallet.tx -import com.bitcoin.wallet.rest.* -import com.bitcoin.wallet.slp.* +import com.bitcoin.slpwallet.rest.* +import com.bitcoin.slpwallet.slp.* import org.bitcoinj.core.Coin import timber.log.Timber import java.math.BigDecimal diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/util/SingletonHolder.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/util/SingletonHolder.kt similarity index 94% rename from slpwallet/src/main/java/com/bitcoin/wallet/util/SingletonHolder.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/util/SingletonHolder.kt index 8334b0e..9ae8af6 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/util/SingletonHolder.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/util/SingletonHolder.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.util +package com.bitcoin.slpwallet.util open class SingletonHolder(creator: (A) -> T) { private var creator: ((A) -> T)? = creator diff --git a/slpwallet/src/main/java/com/bitcoin/wallet/util/TaskScheduler.kt b/slpwallet/src/main/java/com/bitcoin/slpwallet/util/TaskScheduler.kt similarity index 98% rename from slpwallet/src/main/java/com/bitcoin/wallet/util/TaskScheduler.kt rename to slpwallet/src/main/java/com/bitcoin/slpwallet/util/TaskScheduler.kt index 1dcae95..4d73fc9 100644 --- a/slpwallet/src/main/java/com/bitcoin/wallet/util/TaskScheduler.kt +++ b/slpwallet/src/main/java/com/bitcoin/slpwallet/util/TaskScheduler.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.util +package com.bitcoin.slpwallet.util /* * Copyright 2018 Google LLC diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/WalletDatabaseInMemory.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/WalletDatabaseInMemory.kt similarity index 90% rename from slpwallet/src/test/java/com/bitcoin/wallet/WalletDatabaseInMemory.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/WalletDatabaseInMemory.kt index 12dfd3f..6688035 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/WalletDatabaseInMemory.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/WalletDatabaseInMemory.kt @@ -1,14 +1,14 @@ -package com.bitcoin.wallet +package com.bitcoin.slpwallet import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.bitcoin.wallet.persistence.DaoBase -import com.bitcoin.wallet.persistence.SlpTokenBalance -import com.bitcoin.wallet.persistence.SlpTokenBalanceDao -import com.bitcoin.wallet.persistence.WalletDatabase -import com.bitcoin.wallet.slp.* -import com.bitcoin.wallet.tx.Utxo -import com.bitcoin.wallet.tx.UtxoDao +import com.bitcoin.slpwallet.persistence.DaoBase +import com.bitcoin.slpwallet.persistence.SlpTokenBalance +import com.bitcoin.slpwallet.persistence.SlpTokenBalanceDao +import com.bitcoin.slpwallet.persistence.WalletDatabase +import com.bitcoin.slpwallet.slp.* +import com.bitcoin.slpwallet.tx.Utxo +import com.bitcoin.slpwallet.tx.UtxoDao import java.util.concurrent.ConcurrentHashMap /** diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/WalletServiceImplTest.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/WalletServiceImplTest.kt similarity index 95% rename from slpwallet/src/test/java/com/bitcoin/wallet/WalletServiceImplTest.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/WalletServiceImplTest.kt index ea0acbf..a95d3a3 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/WalletServiceImplTest.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/WalletServiceImplTest.kt @@ -1,11 +1,11 @@ -package com.bitcoin.wallet - -import com.bitcoin.wallet.rest.BitcoinRestClientMock -import com.bitcoin.wallet.rest.BitcoinRestClientMockAarAngBch -import com.bitcoin.wallet.rest.BitcoinRestClientMockAarBch -import com.bitcoin.wallet.slp.SlpTokenDetails -import com.bitcoin.wallet.slp.SlpTokenId -import com.bitcoin.wallet.tx.TxBuilder +package com.bitcoin.slpwallet + +import com.bitcoin.slpwallet.rest.BitcoinRestClientMock +import com.bitcoin.slpwallet.rest.BitcoinRestClientMockAarAngBch +import com.bitcoin.slpwallet.rest.BitcoinRestClientMockAarBch +import com.bitcoin.slpwallet.slp.SlpTokenDetails +import com.bitcoin.slpwallet.slp.SlpTokenId +import com.bitcoin.slpwallet.tx.TxBuilder import org.junit.Assert import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/address/AddressCashTest.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/address/AddressCashTest.kt similarity index 95% rename from slpwallet/src/test/java/com/bitcoin/wallet/address/AddressCashTest.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/address/AddressCashTest.kt index 1905eb3..3363639 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/address/AddressCashTest.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/address/AddressCashTest.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.address +package com.bitcoin.slpwallet.address -import com.bitcoin.wallet.Network +import com.bitcoin.slpwallet.Network import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/address/AddressSLPTest.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/address/AddressSLPTest.kt similarity index 95% rename from slpwallet/src/test/java/com/bitcoin/wallet/address/AddressSLPTest.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/address/AddressSLPTest.kt index 9c3bba5..374fcd6 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/address/AddressSLPTest.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/address/AddressSLPTest.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.address +package com.bitcoin.slpwallet.address -import com.bitcoin.wallet.Network +import com.bitcoin.slpwallet.Network import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/bitcoinj/MnemonicTest.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/bitcoinj/MnemonicTest.kt similarity index 89% rename from slpwallet/src/test/java/com/bitcoin/wallet/bitcoinj/MnemonicTest.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/bitcoinj/MnemonicTest.kt index 30d94ce..1c42294 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/bitcoinj/MnemonicTest.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/bitcoinj/MnemonicTest.kt @@ -1,7 +1,7 @@ -package com.bitcoin.wallet.bitcoinj +package com.bitcoin.slpwallet.bitcoinj -import com.bitcoin.wallet.Network -import com.bitcoin.wallet.address.Address +import com.bitcoin.slpwallet.Network +import com.bitcoin.slpwallet.address.Address import org.junit.Assert.assertEquals import org.junit.Test import java.math.BigInteger diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/rest/BitcoinRestClientMock.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/rest/BitcoinRestClientMock.kt similarity index 89% rename from slpwallet/src/test/java/com/bitcoin/wallet/rest/BitcoinRestClientMock.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/rest/BitcoinRestClientMock.kt index ea3944f..04a8561 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/rest/BitcoinRestClientMock.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/rest/BitcoinRestClientMock.kt @@ -1,10 +1,10 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest -import com.bitcoin.wallet.Network -import com.bitcoin.wallet.WalletDatabaseInMemory -import com.bitcoin.wallet.address.Address -import com.bitcoin.wallet.bitcoinj.Mnemonic -import com.bitcoin.wallet.slp.SLPWalletImpl +import com.bitcoin.slpwallet.Network +import com.bitcoin.slpwallet.WalletDatabaseInMemory +import com.bitcoin.slpwallet.address.Address +import com.bitcoin.slpwallet.bitcoinj.Mnemonic +import com.bitcoin.slpwallet.slp.SLPWalletImpl import com.google.gson.Gson import com.google.gson.reflect.TypeToken import io.reactivex.Single diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/rest/BitcoinRestClientMockAarAngBch.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/rest/BitcoinRestClientMockAarAngBch.kt similarity index 90% rename from slpwallet/src/test/java/com/bitcoin/wallet/rest/BitcoinRestClientMockAarAngBch.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/rest/BitcoinRestClientMockAarAngBch.kt index ab23be9..a22a4c0 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/rest/BitcoinRestClientMockAarAngBch.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/rest/BitcoinRestClientMockAarAngBch.kt @@ -1,9 +1,9 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest -import com.bitcoin.wallet.Network -import com.bitcoin.wallet.WalletDatabaseInMemory -import com.bitcoin.wallet.bitcoinj.Mnemonic -import com.bitcoin.wallet.slp.SLPWalletImpl +import com.bitcoin.slpwallet.Network +import com.bitcoin.slpwallet.WalletDatabaseInMemory +import com.bitcoin.slpwallet.bitcoinj.Mnemonic +import com.bitcoin.slpwallet.slp.SLPWalletImpl import com.google.gson.Gson import com.google.gson.reflect.TypeToken import io.reactivex.Single diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/rest/BitcoinRestClientMockAarBch.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/rest/BitcoinRestClientMockAarBch.kt similarity index 89% rename from slpwallet/src/test/java/com/bitcoin/wallet/rest/BitcoinRestClientMockAarBch.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/rest/BitcoinRestClientMockAarBch.kt index ea4c337..2136328 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/rest/BitcoinRestClientMockAarBch.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/rest/BitcoinRestClientMockAarBch.kt @@ -1,9 +1,9 @@ -package com.bitcoin.wallet.rest +package com.bitcoin.slpwallet.rest -import com.bitcoin.wallet.Network -import com.bitcoin.wallet.WalletDatabaseInMemory -import com.bitcoin.wallet.bitcoinj.Mnemonic -import com.bitcoin.wallet.slp.SLPWalletImpl +import com.bitcoin.slpwallet.Network +import com.bitcoin.slpwallet.WalletDatabaseInMemory +import com.bitcoin.slpwallet.bitcoinj.Mnemonic +import com.bitcoin.slpwallet.slp.SLPWalletImpl import com.google.gson.Gson import com.google.gson.reflect.TypeToken import io.reactivex.Single diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/slp/SlpOpReturnTest.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/slp/SlpOpReturnTest.kt similarity index 97% rename from slpwallet/src/test/java/com/bitcoin/wallet/slp/SlpOpReturnTest.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/slp/SlpOpReturnTest.kt index cea6974..79c3528 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/slp/SlpOpReturnTest.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/slp/SlpOpReturnTest.kt @@ -1,6 +1,6 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp -import com.bitcoin.wallet.encoding.ByteUtils +import com.bitcoin.slpwallet.encoding.ByteUtils import org.junit.Assert.* import org.junit.Test import java.math.BigDecimal diff --git a/slpwallet/src/test/java/com/bitcoin/wallet/slp/SlpTokenDetailsTest.kt b/slpwallet/src/test/java/com/bitcoin/slpwallet/slp/SlpTokenDetailsTest.kt similarity index 98% rename from slpwallet/src/test/java/com/bitcoin/wallet/slp/SlpTokenDetailsTest.kt rename to slpwallet/src/test/java/com/bitcoin/slpwallet/slp/SlpTokenDetailsTest.kt index d248b50..9f1d230 100644 --- a/slpwallet/src/test/java/com/bitcoin/wallet/slp/SlpTokenDetailsTest.kt +++ b/slpwallet/src/test/java/com/bitcoin/slpwallet/slp/SlpTokenDetailsTest.kt @@ -1,4 +1,4 @@ -package com.bitcoin.wallet.slp +package com.bitcoin.slpwallet.slp import org.junit.Assert.assertEquals import org.junit.Test