mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-03 18:47:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove duplicate Peer class (#5141)

Browse source
This commit is contained in:
Chris Stewart 2023-07-09 16:10:49 -05:00 • committed by GitHub
parent cde3977312
commit 2b117d349a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,12 +1,12 @@
package org.bitcoins.dlc.node package org.bitcoins.dlc.node
import akka.actor.ActorRef import akka.actor.ActorRef
import org.bitcoins.core.api.node.Peer
import org.bitcoins.core.number.UInt32 import org.bitcoins.core.number.UInt32
import org.bitcoins.core.protocol.BigSizeUInt import org.bitcoins.core.protocol.BigSizeUInt
import org.bitcoins.core.protocol.dlc.models.DLCState import org.bitcoins.core.protocol.dlc.models.DLCState
import org.bitcoins.core.protocol.tlv.{LnMessage, SendOfferTLV} import org.bitcoins.core.protocol.tlv.{LnMessage, SendOfferTLV}
import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte
import org.bitcoins.dlc.node.peer.Peer
import org.bitcoins.rpc.util.RpcUtil import org.bitcoins.rpc.util.RpcUtil
import org.bitcoins.testkit.async.TestAsyncUtil import org.bitcoins.testkit.async.TestAsyncUtil
import org.bitcoins.testkit.wallet.BitcoinSDualWalletTest import org.bitcoins.testkit.wallet.BitcoinSDualWalletTest

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

@ -3,10 +3,10 @@ package org.bitcoins.dlc.node
import akka.actor.ActorRef import akka.actor.ActorRef
import akka.testkit.{TestActorRef, TestProbe} import akka.testkit.{TestActorRef, TestProbe}
import org.bitcoins.asyncutil.AsyncUtil import org.bitcoins.asyncutil.AsyncUtil
import org.bitcoins.core.api.node.Peer
import org.bitcoins.core.number.UInt16 import org.bitcoins.core.number.UInt16
import org.bitcoins.core.protocol.BigSizeUInt import org.bitcoins.core.protocol.BigSizeUInt
import org.bitcoins.core.protocol.tlv.{LnMessage, PingTLV, PongTLV} 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.rpc.util.RpcUtil
import org.bitcoins.testkit.util.BitcoinSActorFixtureWithDLCWallet import org.bitcoins.testkit.util.BitcoinSActorFixtureWithDLCWallet
import org.bitcoins.testkit.wallet.FundWalletUtil.FundedDLCWallet import org.bitcoins.testkit.wallet.FundWalletUtil.FundedDLCWallet

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

@ -3,12 +3,12 @@ package org.bitcoins.dlc.node
import akka.actor.ActorRef import akka.actor.ActorRef
import akka.testkit.{TestActorRef, TestProbe} import akka.testkit.{TestActorRef, TestProbe}
import org.bitcoins.asyncutil.AsyncUtil import org.bitcoins.asyncutil.AsyncUtil
import org.bitcoins.core.api.node.Peer
import org.bitcoins.core.api.tor.Socks5ProxyParams import org.bitcoins.core.api.tor.Socks5ProxyParams
import org.bitcoins.core.number.UInt16 import org.bitcoins.core.number.UInt16
import org.bitcoins.core.protocol.BigSizeUInt import org.bitcoins.core.protocol.BigSizeUInt
import org.bitcoins.core.protocol.tlv.{LnMessage, PingTLV, PongTLV} import org.bitcoins.core.protocol.tlv.{LnMessage, PingTLV, PongTLV}
import org.bitcoins.dlc.node.DLCDataHandler.Received import org.bitcoins.dlc.node.DLCDataHandler.Received
import org.bitcoins.dlc.node.peer.Peer
import org.bitcoins.rpc.util.RpcUtil import org.bitcoins.rpc.util.RpcUtil
import org.bitcoins.server.BitcoinSAppConfig import org.bitcoins.server.BitcoinSAppConfig
import org.bitcoins.testkit.tor.CachedTor import org.bitcoins.testkit.tor.CachedTor

2
dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCClient.scala
View file

@ -4,9 +4,9 @@ import akka.actor._
import akka.event.LoggingReceive import akka.event.LoggingReceive
import akka.io.{IO, Tcp} import akka.io.{IO, Tcp}
import org.bitcoins.core.api.dlc.wallet.DLCWalletApi 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.api.tor.Socks5ProxyParams
import org.bitcoins.core.protocol.BigSizeUInt 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.{Socks5Connect, Socks5Connected}
import org.bitcoins.tor.Socks5Connection import org.bitcoins.tor.Socks5Connection
import scodec.bits.ByteVector import scodec.bits.ByteVector

2
dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCNode.scala
View file

@ -4,12 +4,12 @@ import akka.actor.{ActorRef, ActorSystem}
import grizzled.slf4j.Logging import grizzled.slf4j.Logging
import org.bitcoins.core.api.dlc.node.DLCNodeApi import org.bitcoins.core.api.dlc.node.DLCNodeApi
import org.bitcoins.core.api.dlc.wallet.DLCWalletApi 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.dlc.models.DLCMessage
import org.bitcoins.core.protocol.tlv._ import org.bitcoins.core.protocol.tlv._
import org.bitcoins.core.protocol.{BigSizeUInt, BitcoinAddress} import org.bitcoins.core.protocol.{BigSizeUInt, BitcoinAddress}
import org.bitcoins.crypto.Sha256Digest import org.bitcoins.crypto.Sha256Digest
import org.bitcoins.dlc.node.config._ import org.bitcoins.dlc.node.config._
import org.bitcoins.dlc.node.peer.Peer
import scodec.bits.ByteVector import scodec.bits.ByteVector
import java.net.InetSocketAddress import java.net.InetSocketAddress

30
dlc-node/src/main/scala/org/bitcoins/dlc/node/peer/Peer.scala
View file

@ -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)
}
}