From 2b117d349a2bd018cd9709c99fe90601c93e3fd3 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Sun, 9 Jul 2023 16:10:49 -0500 Subject: [PATCH] Remove duplicate Peer class (#5141) --- .../dlc/node/DLCNegotiationTest.scala | 2 +- .../org/bitcoins/dlc/node/DLCServerTest.scala | 2 +- .../bitcoins/dlc/node/DLCServerTorTest.scala | 2 +- .../org/bitcoins/dlc/node/DLCClient.scala | 2 +- .../scala/org/bitcoins/dlc/node/DLCNode.scala | 2 +- .../org/bitcoins/dlc/node/peer/Peer.scala | 30 ------------------- 6 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 dlc-node/src/main/scala/org/bitcoins/dlc/node/peer/Peer.scala diff --git a/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCNegotiationTest.scala b/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCNegotiationTest.scala index 945de16585..484564a61e 100644 --- a/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCNegotiationTest.scala +++ b/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCNegotiationTest.scala @@ -1,12 +1,12 @@ package org.bitcoins.dlc.node import akka.actor.ActorRef +import org.bitcoins.core.api.node.Peer import org.bitcoins.core.number.UInt32 import org.bitcoins.core.protocol.BigSizeUInt import org.bitcoins.core.protocol.dlc.models.DLCState import org.bitcoins.core.protocol.tlv.{LnMessage, SendOfferTLV} import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte -import org.bitcoins.dlc.node.peer.Peer import org.bitcoins.rpc.util.RpcUtil import org.bitcoins.testkit.async.TestAsyncUtil import org.bitcoins.testkit.wallet.BitcoinSDualWalletTest diff --git a/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCServerTest.scala b/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCServerTest.scala index 33a4d10b3e..40b610acad 100644 --- a/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCServerTest.scala +++ b/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCServerTest.scala @@ -3,10 +3,10 @@ package org.bitcoins.dlc.node import akka.actor.ActorRef import akka.testkit.{TestActorRef, TestProbe} import org.bitcoins.asyncutil.AsyncUtil +import org.bitcoins.core.api.node.Peer import org.bitcoins.core.number.UInt16 import org.bitcoins.core.protocol.BigSizeUInt import org.bitcoins.core.protocol.tlv.{LnMessage, PingTLV, PongTLV} -import org.bitcoins.dlc.node.peer.Peer import org.bitcoins.rpc.util.RpcUtil import org.bitcoins.testkit.util.BitcoinSActorFixtureWithDLCWallet import org.bitcoins.testkit.wallet.FundWalletUtil.FundedDLCWallet diff --git a/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCServerTorTest.scala b/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCServerTorTest.scala index 4a447b0bfc..c80ffb52a8 100644 --- a/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCServerTorTest.scala +++ b/dlc-node-test/src/test/scala/org/bitcoins/dlc/node/DLCServerTorTest.scala @@ -3,12 +3,12 @@ package org.bitcoins.dlc.node import akka.actor.ActorRef import akka.testkit.{TestActorRef, TestProbe} import org.bitcoins.asyncutil.AsyncUtil +import org.bitcoins.core.api.node.Peer import org.bitcoins.core.api.tor.Socks5ProxyParams import org.bitcoins.core.number.UInt16 import org.bitcoins.core.protocol.BigSizeUInt import org.bitcoins.core.protocol.tlv.{LnMessage, PingTLV, PongTLV} import org.bitcoins.dlc.node.DLCDataHandler.Received -import org.bitcoins.dlc.node.peer.Peer import org.bitcoins.rpc.util.RpcUtil import org.bitcoins.server.BitcoinSAppConfig import org.bitcoins.testkit.tor.CachedTor diff --git a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCClient.scala b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCClient.scala index f464561705..ce5c5c85da 100644 --- a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCClient.scala +++ b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCClient.scala @@ -4,9 +4,9 @@ import akka.actor._ import akka.event.LoggingReceive import akka.io.{IO, Tcp} import org.bitcoins.core.api.dlc.wallet.DLCWalletApi +import org.bitcoins.core.api.node.Peer import org.bitcoins.core.api.tor.Socks5ProxyParams import org.bitcoins.core.protocol.BigSizeUInt -import org.bitcoins.dlc.node.peer.Peer import org.bitcoins.tor.Socks5Connection.{Socks5Connect, Socks5Connected} import org.bitcoins.tor.Socks5Connection import scodec.bits.ByteVector diff --git a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCNode.scala b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCNode.scala index ee90257f16..870df95534 100644 --- a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCNode.scala +++ b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCNode.scala @@ -4,12 +4,12 @@ import akka.actor.{ActorRef, ActorSystem} import grizzled.slf4j.Logging import org.bitcoins.core.api.dlc.node.DLCNodeApi import org.bitcoins.core.api.dlc.wallet.DLCWalletApi +import org.bitcoins.core.api.node.Peer import org.bitcoins.core.protocol.dlc.models.DLCMessage import org.bitcoins.core.protocol.tlv._ import org.bitcoins.core.protocol.{BigSizeUInt, BitcoinAddress} import org.bitcoins.crypto.Sha256Digest import org.bitcoins.dlc.node.config._ -import org.bitcoins.dlc.node.peer.Peer import scodec.bits.ByteVector import java.net.InetSocketAddress diff --git a/dlc-node/src/main/scala/org/bitcoins/dlc/node/peer/Peer.scala b/dlc-node/src/main/scala/org/bitcoins/dlc/node/peer/Peer.scala deleted file mode 100644 index e2e35cc0b4..0000000000 --- a/dlc-node/src/main/scala/org/bitcoins/dlc/node/peer/Peer.scala +++ /dev/null @@ -1,30 +0,0 @@ -package org.bitcoins.dlc.node.peer - -import org.bitcoins.core.api.db.DbRowAutoInc -import org.bitcoins.core.api.tor.Socks5ProxyParams - -import java.net.InetSocketAddress - -case class Peer( - socket: InetSocketAddress, - socks5ProxyParams: Option[Socks5ProxyParams], - id: Option[Long] = None) - extends DbRowAutoInc[Peer] { - - override def copyWithId(id: Long): Peer = { - this.copy(id = Some(id)) - } - - override def toString: String = - s"Peer(${socket.getHostString}:${socket.getPort})" - -} - -object Peer { - - def fromSocket( - socket: InetSocketAddress, - socks5ProxyParams: Option[Socks5ProxyParams]): Peer = { - Peer(socket, socks5ProxyParams = socks5ProxyParams) - } -}