mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-23 14:50:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add error field toImportDescriptorResult, move BitcoindException to app-commons (#5705)

Browse source 
* Add error field to ImportDescriptorResult, move BitcoindException to app-commons

* Fix docs
This commit is contained in:
Chris Stewart 2024-10-12 09:49:42 -05:00 • committed by GitHub
parent 2d87129978
commit 4471f74ccf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/bitcoind/WalletResult.scala
View file

@ -1,6 +1,7 @@
package org.bitcoins.commons.jsonmodels.bitcoind
import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts.LabelPurpose
import org.bitcoins.commons.rpc.BitcoindException
import org.bitcoins.core.currency.{Bitcoins, Satoshis}
import org.bitcoins.core.hd.BIP32Path
import org.bitcoins.core.number.UInt32
@ -389,7 +390,8 @@ final case class CreateWalletResult(
case class ImportDescriptorResult(
success: Boolean,
warnings: Option[Vector[String]]
warnings: Option[Vector[String]],
error: Option[BitcoindException]
) extends WalletResult
case class PrioritisedTransaction(fee_delta: Satoshis, in_mempool: Boolean)

12
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/BitcoindException.scala → app-commons/src/main/scala/org/bitcoins/commons/rpc/BitcoindException.scala
View file

@ -1,9 +1,6 @@
package org.bitcoins.rpc
package org.bitcoins.commons.rpc
import play.api.libs.json.Reads
import play.api.libs.json.{JsResult, JsValue}
import play.api.libs.json.JsError
import play.api.libs.json.JsSuccess
import play.api.libs.json.*
/** Represents failures that can happen when using the `bitcoind` RPC interface.
*
@ -25,9 +22,8 @@ sealed abstract class BitcoindException(private val message: String)
*/
object BitcoindException {
import org.bitcoins.rpc.BitcoindP2PException._
import org.bitcoins.rpc.BitcoindWalletException._
import BitcoindP2PException.*
import BitcoindWalletException.*
implicit val reads: Reads[BitcoindException] = new Reads[BitcoindException] {
def reads(json: JsValue): JsResult[BitcoindException] =

2
app/server/src/main/scala/org/bitcoins/server/BitcoinSServerMain.scala
View file

@ -34,7 +34,7 @@ import org.bitcoins.node.Node
import org.bitcoins.node.config.NodeAppConfig
import org.bitcoins.node.models.NodeStateDescriptorDAO
import org.bitcoins.rpc.BitcoindCallbacks
import org.bitcoins.rpc.BitcoindException.InWarmUp
import org.bitcoins.commons.rpc.BitcoindException.InWarmUp
import org.bitcoins.rpc.client.common.BitcoindRpcClient
import org.bitcoins.rpc.config.{BitcoindRpcAppConfig, ZmqConfig}
import org.bitcoins.server.bitcoind.BitcoindSyncState

2
bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MempoolRpcTest.scala
View file

@ -1,5 +1,6 @@
package org.bitcoins.rpc.common
import org.bitcoins.commons.rpc.BitcoindException
import org.bitcoins.core.currency.{Bitcoins, Satoshis}
import org.bitcoins.core.number.UInt32
import org.bitcoins.core.protocol.BitcoinAddress
@ -9,7 +10,6 @@ import org.bitcoins.core.protocol.transaction.{
TransactionOutPoint
}
import org.bitcoins.crypto.DoubleSha256Digest
import org.bitcoins.rpc.BitcoindException
import org.bitcoins.rpc.config.{BitcoindInstanceLocal, BitcoindInstanceRemote}
import org.bitcoins.testkit.rpc.{
BitcoindFixturesCachedPairNewest,

2
bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/MultiWalletRpcTest.scala
View file

@ -1,10 +1,10 @@
package org.bitcoins.rpc.common
import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts.AddressType
import org.bitcoins.commons.rpc.BitcoindWalletException
import org.bitcoins.core.currency.{Bitcoins, Satoshis}
import org.bitcoins.core.protocol.transaction._
import org.bitcoins.core.wallet.fee.SatoshisPerByte
import org.bitcoins.rpc._
import org.bitcoins.rpc.client.common._
import org.bitcoins.rpc.config.{BitcoindInstanceLocal, BitcoindInstanceRemote}
import org.bitcoins.rpc.util.{NodePair, RpcUtil}

2
bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/NodeRpcTest.scala
View file

@ -1,7 +1,7 @@
package org.bitcoins.rpc.common
import org.bitcoins.core.number.UInt32
import org.bitcoins.rpc.BitcoindException.MiscError
import org.bitcoins.commons.rpc.BitcoindException.MiscError
import org.bitcoins.testkit.rpc.BitcoindFixturesFundedCachedNewest
import scala.concurrent.duration._

2
bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/RawTransactionRpcTest.scala
View file

@ -10,7 +10,7 @@ import org.bitcoins.core.protocol.script.{
}
import org.bitcoins.core.protocol.transaction._
import org.bitcoins.core.wallet.fee.SatoshisPerByte
import org.bitcoins.rpc.BitcoindException.InvalidAddressOrKey
import org.bitcoins.commons.rpc.BitcoindException.InvalidAddressOrKey
import org.bitcoins.testkit.rpc.{
BitcoindFixturesCachedPairNewest,
BitcoindRpcTestUtil

6
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala
View file

@ -32,9 +32,9 @@ import scala.concurrent.Future
* versions. If you need RPC calls specific to a version, check out
*
* If a RPC call fails for any reason, a
* [[org.bitcoins.rpc.BitcoindException BitcoindException]] is thrown. This is
* a sealed abstract class, so you can pattern match easily on the errors, and
* handle them as you see fit.
* [[BitcoindException BitcoindException]] is thrown. This is a sealed abstract
* class, so you can pattern match easily on the errors, and handle them as you
* see fit.
*/
class BitcoindRpcClient(override val instance: BitcoindInstance)(implicit
override val system: ActorSystem,

2
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala
View file

@ -22,7 +22,7 @@ import org.bitcoins.core.config._
import org.bitcoins.core.crypto.ECPrivateKeyUtil
import org.bitcoins.core.util.StartStopAsync
import org.bitcoins.crypto.{ECPrivateKey, ECPrivateKeyBytes}
import org.bitcoins.rpc.BitcoindException
import org.bitcoins.commons.rpc.BitcoindException
import org.bitcoins.rpc.config.BitcoindAuthCredentials.{
CookieBased,
PasswordBased

2
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/MempoolRpc.scala
View file

@ -1,11 +1,11 @@
package org.bitcoins.rpc.client.common
import org.bitcoins.commons.jsonmodels.bitcoind._
import org.bitcoins.commons.rpc.BitcoindException
import org.bitcoins.commons.serializers.JsonReaders._
import org.bitcoins.commons.serializers.JsonSerializers._
import org.bitcoins.core.protocol.transaction.{Transaction, TransactionOutPoint}
import org.bitcoins.crypto.{DoubleSha256Digest, DoubleSha256DigestBE}
import org.bitcoins.rpc.BitcoindException
import play.api.libs.json.{JsArray, JsBoolean, JsString, Json}
import java.nio.file.Path

2
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindRpcAppConfig.scala
View file

@ -8,7 +8,7 @@ import org.bitcoins.core.api.CallbackConfig
import org.bitcoins.core.api.callback.CallbackFactory
import org.bitcoins.core.api.tor.Socks5ProxyParams
import org.bitcoins.rpc.BitcoindCallbacks
import org.bitcoins.rpc.BitcoindException.InWarmUp
import org.bitcoins.commons.rpc.BitcoindException.InWarmUp
import org.bitcoins.rpc.client.common.{BitcoindRpcClient, BitcoindVersion}
import org.bitcoins.rpc.util.AppConfigFactoryActorSystem
import org.bitcoins.tor.config.TorAppConfig

4
dlc-wallet-test/src/test/scala/org/bitcoins/dlc/integration/DLCClientIntegrationTest.scala
View file

@ -1,5 +1,6 @@
package org.bitcoins.dlc.integration
import org.bitcoins.commons.rpc.BitcoindException
import org.bitcoins.core.currency.{Bitcoins, CurrencyUnit, Satoshis}
import org.bitcoins.core.number.{UInt16, UInt32}
import org.bitcoins.core.protocol.BlockStamp.BlockHeight
@ -20,8 +21,7 @@ import org.bitcoins.core.protocol.transaction.{
}
import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte
import org.bitcoins.core.wallet.utxo._
import org.bitcoins.crypto.{HashType, _}
import org.bitcoins.rpc.BitcoindException
import org.bitcoins.crypto.*
import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil
import org.bitcoins.testkit.util.BitcoindRpcTest
import org.bitcoins.testkitcore.dlc.{DLCFeeTestUtil, DLCTest, TestDLCClient}

2
docs/rpc/bitcoind.md
View file

@ -36,7 +36,7 @@ import org.bitcoins.core.config._
import org.bitcoins.rpc.config._
import org.bitcoins.rpc.client.common._
import org.bitcoins.rpc.BitcoindWalletException
import org.bitcoins.commons.rpc.BitcoindWalletException
import org.bitcoins.crypto._
import org.bitcoins.core.protocol._
import org.bitcoins.core.currency._

2
node-test/src/test/scala/org/bitcoins/node/BroadcastTransactionTest.scala
View file

@ -1,8 +1,8 @@
package org.bitcoins.node
import org.bitcoins.commons.rpc.BitcoindException
import org.bitcoins.core.currency._
import org.bitcoins.core.protocol.transaction.Transaction
import org.bitcoins.rpc.BitcoindException
import org.bitcoins.rpc.client.common.BitcoindRpcClient
import org.bitcoins.server.BitcoinSAppConfig
import org.bitcoins.testkit.BitcoinSTestAppConfig

4
testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala
View file

@ -9,6 +9,7 @@ import org.bitcoins.commons.jsonmodels.bitcoind.{
RpcOpts,
SignRawTransactionResult
}
import org.bitcoins.commons.rpc.BitcoindException
import org.bitcoins.commons.util.BitcoinSLogger
import org.bitcoins.core.config.RegTest
import org.bitcoins.core.currency.Bitcoins
@ -26,8 +27,7 @@ import org.bitcoins.crypto.{
DoubleSha256DigestBE,
ECPublicKey
}
import org.bitcoins.rpc.BitcoindException
import org.bitcoins.rpc.client.common.BitcoindVersion._
import org.bitcoins.rpc.client.common.BitcoindVersion.*
import org.bitcoins.rpc.client.common.{BitcoindRpcClient, BitcoindVersion}
import org.bitcoins.rpc.client.v25.BitcoindV25RpcClient
import org.bitcoins.rpc.client.v26.BitcoindV26RpcClient

2
wallet-test/src/test/scala/org/bitcoins/wallet/WalletIntegrationTest.scala
View file

@ -9,7 +9,7 @@ import org.bitcoins.core.psbt.PSBT
import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte
import org.bitcoins.core.wallet.utxo.TxoState
import org.bitcoins.feeprovider.RandomFeeProvider
import org.bitcoins.rpc.BitcoindException.InvalidAddressOrKey
import org.bitcoins.commons.rpc.BitcoindException.InvalidAddressOrKey
import org.bitcoins.testkit.wallet.{
BitcoinSWalletTestCachedBitcoindNewest,
WalletTestUtil,