diff --git a/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala b/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala index 91379b7102..ad91f05f15 100644 --- a/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala +++ b/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala @@ -795,14 +795,14 @@ class RoutesSpec extends AnyWordSpec with ScalatestRouteTest with MockFactory { val tx = Transaction( "020000000258e87a21b56daf0c23be8e7070456c336f7cbaa5c8757924f545887bb2abdd750000000000ffffffff838d0427d0ec650a68aa46bb0b098aea4422c071b2ca78352a077959d07cea1d0100000000ffffffff0270aaf00800000000160014d85c2b71d0060b09c9886aeb815e50991dda124d00e1f5050000000016001400aea9a2e5f0f876a588df5546e8742d1d87008f00000000") - (mockNode + (mockWalletApi .broadcastTransaction(_: Transaction)) .expects(tx) .returning(Future.unit) .anyNumberOfTimes() val route = - nodeRoutes.handleCommand( + walletRoutes.handleCommand( ServerCommand("sendrawtransaction", Arr(Str(tx.hex)))) Get() ~> route ~> check { diff --git a/app/server/src/main/scala/org/bitcoins/server/NodeRoutes.scala b/app/server/src/main/scala/org/bitcoins/server/NodeRoutes.scala index 67fe178b31..1a9777a73e 100644 --- a/app/server/src/main/scala/org/bitcoins/server/NodeRoutes.scala +++ b/app/server/src/main/scala/org/bitcoins/server/NodeRoutes.scala @@ -3,7 +3,6 @@ package org.bitcoins.server import akka.actor.ActorSystem import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server._ -import org.bitcoins.commons.serializers.Picklers._ import org.bitcoins.core.api.node.NodeApi import org.bitcoins.node.Node import org.bitcoins.rpc.client.common.BitcoindRpcClient @@ -42,15 +41,5 @@ case class NodeRoutes(nodeApi: NodeApi)(implicit system: ActorSystem) nodeStopping } } - - case ServerCommand("sendrawtransaction", arr) => - withValidServerCommand(SendRawTransaction.fromJsArr(arr)) { - case SendRawTransaction(tx) => - complete { - nodeApi.broadcastTransaction(tx).map { _ => - Server.httpSuccess(tx.txIdBE) - } - } - } } } diff --git a/app/server/src/main/scala/org/bitcoins/server/WalletRoutes.scala b/app/server/src/main/scala/org/bitcoins/server/WalletRoutes.scala index 1ed53f08d6..e35ba891bc 100644 --- a/app/server/src/main/scala/org/bitcoins/server/WalletRoutes.scala +++ b/app/server/src/main/scala/org/bitcoins/server/WalletRoutes.scala @@ -799,6 +799,16 @@ case class WalletRoutes(wallet: AnyDLCHDWalletApi)(implicit } } + case ServerCommand("sendrawtransaction", arr) => + withValidServerCommand(SendRawTransaction.fromJsArr(arr)) { + case SendRawTransaction(tx) => + complete { + wallet.broadcastTransaction(tx).map { _ => + Server.httpSuccess(tx.txIdBE) + } + } + } + case ServerCommand("estimatefee", _) => complete { wallet.getFeeRate.map { fee =>