diff --git a/app-commons-test/src/test/scala/org/bitcoins/commons/DLCStatusTest.scala b/app-commons-test/src/test/scala/org/bitcoins/commons/DLCStatusTest.scala index 164bb7483e..fbb8233def 100644 --- a/app-commons-test/src/test/scala/org/bitcoins/commons/DLCStatusTest.scala +++ b/app-commons-test/src/test/scala/org/bitcoins/commons/DLCStatusTest.scala @@ -2,7 +2,6 @@ package org.bitcoins.commons import org.bitcoins.commons.serializers.Picklers import org.bitcoins.commons.serializers.Picklers._ -import org.bitcoins.core.api.dlc.wallet.db.DLCContactDb import org.bitcoins.core.currency.{CurrencyUnit, Satoshis} import org.bitcoins.core.protocol.BitcoinAddress import org.bitcoins.core.protocol.dlc.models.DLCMessage._ @@ -18,8 +17,6 @@ import org.bitcoins.testkitcore.util.BitcoinSJvmTest import org.scalacheck.Gen import upickle.default._ -import java.net.InetSocketAddress - class DLCStatusTest extends BitcoinSJvmTest { behavior of "DLCStatus" @@ -32,11 +29,7 @@ class DLCStatusTest extends BitcoinSJvmTest { val payoutAddress = Option.empty[PayoutAddress] - val contact = Some( - DLCContactDb(address = - InetSocketAddress.createUnresolved("127.0.0.1", 0), - alias = "alias", - memo = "memo")) + val contact = Some("127.0.0.1:0") val status = DLCStatus.Offered( @@ -50,7 +43,7 @@ class DLCStatusTest extends BitcoinSJvmTest { totalCollateral, offer.collateral, payoutAddress, - contact.map(_.address) + contact ) assert(status.state == DLCState.Offered) @@ -76,7 +69,7 @@ class DLCStatusTest extends BitcoinSJvmTest { "tb1q4ps6c9ewa7uca5v39fakykq9q6hpgjkxje8gve"), true)) - val contact = Option.empty[DLCContactDb] + val contact = Option.empty[String] val status = DLCStatus.Accepted( @@ -91,7 +84,7 @@ class DLCStatusTest extends BitcoinSJvmTest { totalCollateral, offer.collateral, payoutAddress, - contact.map(_.address) + contact ) assert(status.state == DLCState.Accepted) @@ -113,7 +106,7 @@ class DLCStatusTest extends BitcoinSJvmTest { val payoutAddress = Option.empty[PayoutAddress] - val contact = Option.empty[DLCContactDb] + val contact = Option.empty[String] val status = DLCStatus.Signed( @@ -129,7 +122,7 @@ class DLCStatusTest extends BitcoinSJvmTest { offer.collateral, txId, payoutAddress, - contact.map(_.address) + contact ) assert(status.state == DLCState.Signed) @@ -151,7 +144,7 @@ class DLCStatusTest extends BitcoinSJvmTest { val payoutAddress = Option.empty[PayoutAddress] - val contact = Option.empty[DLCContactDb] + val contact = Option.empty[String] val status = DLCStatus.Broadcasted( @@ -167,7 +160,7 @@ class DLCStatusTest extends BitcoinSJvmTest { offer.collateral, fundingTxId, payoutAddress, - contact.map(_.address) + contact ) assert(status.state == DLCState.Broadcasted) @@ -189,7 +182,7 @@ class DLCStatusTest extends BitcoinSJvmTest { val payoutAddress = Option.empty[PayoutAddress] - val contact = Option.empty[DLCContactDb] + val contact = Option.empty[String] val status = DLCStatus.Confirmed( @@ -205,7 +198,7 @@ class DLCStatusTest extends BitcoinSJvmTest { offer.collateral, fundingTxId, payoutAddress, - contact.map(_.address) + contact ) assert(status.state == DLCState.Confirmed) @@ -238,7 +231,7 @@ class DLCStatusTest extends BitcoinSJvmTest { val payoutAddress = Option.empty[PayoutAddress] - val contact = Option.empty[DLCContactDb] + val contact = Option.empty[String] val status = DLCStatus.Claimed( @@ -259,7 +252,7 @@ class DLCStatusTest extends BitcoinSJvmTest { myPayout = myPayout, counterPartyPayout = theirPayout, payoutAddress = payoutAddress, - contact.map(_.address) + contact ) assert(status.state == DLCState.Claimed) @@ -295,7 +288,7 @@ class DLCStatusTest extends BitcoinSJvmTest { val payoutAddress = Option.empty[PayoutAddress] - val contact = Option.empty[DLCContactDb] + val contact = Option.empty[String] val status = DLCStatus.RemoteClaimed( @@ -316,7 +309,7 @@ class DLCStatusTest extends BitcoinSJvmTest { myPayout = myPayout, counterPartyPayout = theirPayout, payoutAddress = payoutAddress, - contact.map(_.address) + contact ) assert(status.state == DLCState.RemoteClaimed) @@ -348,7 +341,7 @@ class DLCStatusTest extends BitcoinSJvmTest { val payoutAddress = Option.empty[PayoutAddress] - val contact = Option.empty[DLCContactDb] + val contact = Option.empty[String] val status = DLCStatus.Refunded( @@ -367,7 +360,7 @@ class DLCStatusTest extends BitcoinSJvmTest { myPayout = myPayout, counterPartyPayout = theirPayout, payoutAddress = payoutAddress, - contact.map(_.address) + contact ) assert(status.state == DLCState.Refunded) diff --git a/app/server-test/src/test/scala/org/bitcoins/server/DLCRoutesSpec.scala b/app/server-test/src/test/scala/org/bitcoins/server/DLCRoutesSpec.scala index bf38319084..d4b44544ae 100644 --- a/app/server-test/src/test/scala/org/bitcoins/server/DLCRoutesSpec.scala +++ b/app/server-test/src/test/scala/org/bitcoins/server/DLCRoutesSpec.scala @@ -2,12 +2,11 @@ package org.bitcoins.server import akka.http.scaladsl.model.ContentTypes import akka.http.scaladsl.testkit.ScalatestRouteTest -import org.bitcoins.core.api.dlc.wallet.db.{DLCContactDb, DLCContactMappingDb} +import org.bitcoins.core.api.dlc.wallet.db.DLCContactDb import org.bitcoins.core.currency.{Bitcoins, Satoshis} import org.bitcoins.core.protocol.dlc.models.ContractInfo import org.bitcoins.core.protocol.tlv.OracleAnnouncementTLV import org.bitcoins.core.serializers.PicklerKeys -import org.bitcoins.crypto.Sha256Digest import org.bitcoins.dlc.node.DLCNode import org.bitcoins.server.routes.ServerCommand import org.bitcoins.testkit.BitcoinSTestAppConfig @@ -207,46 +206,5 @@ class DLCRoutesSpec } } - "dlc-contact-add a peer" in { - (mockWallet - .addDLCContactMapping(_: Sha256Digest, _: InetSocketAddress)) - .expects(Sha256Digest.empty, expected.address) - .returning( - Future.successful( - DLCContactMappingDb(Sha256Digest.empty, - InetSocketAddress.createUnresolved("127.0.0.1", - 1)))) - - val args = - ujson.Arr(ujson.Str(Sha256Digest.empty.hex), ujson.Str(address)) - - val route = - dlcRoutes.handleCommand(ServerCommand("dlc-contact-add", args)) - - Post() ~> route ~> check { - assert(contentType == ContentTypes.`application/json`) - assert( - responseAs[String] == s"""{"result":{"dlcId":"0000000000000000000000000000000000000000000000000000000000000000","contactId":"127.0.0.1:1"},"error":null}""") - } - } - - "dlc-contact-remove a peer" in { - - (mockWallet - .removeDLCContactMapping(_: Sha256Digest)) - .expects(Sha256Digest.empty) - .returning(Future.unit) - - val args = ujson.Arr(ujson.Str(Sha256Digest.empty.hex)) - - val route = - dlcRoutes.handleCommand(ServerCommand("dlc-contact-remove", args)) - - Post() ~> route ~> check { - assert(contentType == ContentTypes.`application/json`) - assert(responseAs[String] == s"""{"result":"ok","error":null}""") - } - } - } }