From 177542a13cbb63aa75979b216746456704de4a3f Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Mon, 18 Mar 2024 16:48:58 -0500 Subject: [PATCH] Remove grizzled.sl4fj was its no longer maintained (#5482) --- .../bitcoins/commons/config/AppConfig.scala | 13 ++++--- .../org/bitcoins/commons/file/FileUtil.scala | 4 +- .../org/bitcoins/commons/rpc/Command.scala | 5 +-- .../commons/util/BitcoinSLogger.scala | 8 ++++ .../commons/util/NativeProcessFactory.scala | 5 +-- .../scala/org/bitcoins/cli/ConsoleCli.scala | 4 +- .../server/routes/BitcoinSRunner.scala | 5 +-- .../bitcoins/server/routes/HttpLogger.scala | 4 +- .../org/bitcoins/server/routes/Server.scala | 4 +- .../bitcoins/server/util/BitcoinSApp.scala | 4 +- .../bitcoins/server/util/ServerBindings.scala | 4 +- .../bitcoins/server/BitcoinSAppConfig.scala | 7 ++-- .../server/BitcoindRpcBackendUtil.scala | 4 +- .../bitcoins/server/DLCWalletLoaderApi.scala | 6 ++- .../org/bitcoins/server/WalletRoutes.scala | 4 +- .../util/BitcoindPollingCancellabe.scala | 4 +- .../bitcoins/server/util/CallbackUtil.scala | 4 +- .../bitcoins/server/util/WebsocketUtil.scala | 4 +- .../rpc/client/common/BitcoindRpcClient.scala | 6 ++- .../bitcoins/rpc/client/common/Client.scala | 5 +-- .../rpc/config/BitcoindAuthCredentials.scala | 5 ++- .../bitcoins/rpc/config/BitcoindConfig.scala | 8 ++-- .../rpc/config/BitcoindInstance.scala | 5 +-- .../org/bitcoins/rpc/config/ZmqConfig.scala | 6 +-- build.sbt | 3 +- .../org/bitcoins/chain/ChainCallbacks.scala | 6 ++- .../chain/ChainVerificationLogger.scala | 4 +- .../clightning/rpc/CLightningRpcClient.scala | 5 +-- .../rpc/config/CLightningConfig.scala | 8 ++-- .../src/main/scala/org/bitcoins/db/CRUD.scala | 4 +- .../scala/org/bitcoins/db/DbManagement.scala | 4 +- .../scala/org/bitcoins/db/HikariLogging.scala | 10 ++--- .../bitcoins/db/JdbcProfileComponent.scala | 4 +- .../scala/org/bitcoins/db/SQLiteUtil.scala | 4 +- .../dlc/node/DLCConnectionHandler.scala | 4 +- .../scala/org/bitcoins/dlc/node/DLCNode.scala | 4 +- .../bitcoins/dlc/node/DLCNodeCallbacks.scala | 6 ++- .../org/bitcoins/dlc/node/DLCServer.scala | 4 +- .../org/bitcoins/dlc/oracle/DLCOracle.scala | 4 +- .../DLCWalletCallbackStreamManager.scala | 4 +- .../wallet/callback/DLCWalletCallbacks.scala | 4 +- .../wallet/internal/DLCDataManagement.scala | 6 +-- .../dlc/wallet/util/DLCAcceptUtil.scala | 4 +- .../feeprovider/FeeProviderFactory.scala | 4 +- .../keymanager/KeyManagerLogger.scala | 4 +- .../keymanager/bip39/BIP39KeyManager.scala | 4 +- .../bip39/BIP39LockedKeyManager.scala | 4 +- .../org/bitcoins/lnd/rpc/LndRpcClient.scala | 5 +-- .../bitcoins/lnd/rpc/config/LndConfig.scala | 6 +-- .../org/bitcoins/lnurl/LnURLClient.scala | 4 +- .../org/bitcoins/node/NodeCallbacks.scala | 4 +- .../scala/org/bitcoins/node/P2PLogger.scala | 4 +- .../scala/org/bitcoins/node/PeerManager.scala | 4 +- .../callback/NodeCallbackStreamManager.scala | 4 +- project/Deps.scala | 38 +++++-------------- .../org/bitcoins/testkit/chain/SyncUtil.scala | 4 +- .../clightning/CLightningRpcTestUtil.scala | 4 +- .../eclair/rpc/EclairRpcTestUtil.scala | 4 +- .../bitcoins/testkit/lnd/LndRpcTestUtil.scala | 4 +- .../testkit/rpc/BitcoindRpcTestUtil.scala | 4 +- .../testkit/util/BitcoinSAsyncTest.scala | 4 +- .../testkit/util/BitcoindRpcTest.scala | 5 ++- .../org/bitcoins/testkit/util/FileUtil.scala | 4 +- .../bitcoins/testkit/util/RpcBinaryUtil.scala | 4 +- .../org/bitcoins/testkit/util/TorUtil.scala | 4 +- .../testkit/wallet/DLCWalletUtil.scala | 4 +- .../testkit/wallet/FundWalletUtil.scala | 4 +- .../bitcoins/tor/Socks5ClientTransport.scala | 4 +- .../org/bitcoins/tor/Socks5Connection.scala | 6 +-- .../scala/org/bitcoins/tor/TorCallbacks.scala | 4 +- .../org/bitcoins/tor/TorController.scala | 4 +- .../org/bitcoins/tor/client/TorClient.scala | 9 ++--- .../bitcoins/wallet/UTXOLifeCycleTest.scala | 4 +- .../org/bitcoins/wallet/WalletHolder.scala | 4 +- .../org/bitcoins/wallet/WalletLogger.scala | 4 +- .../WalletCallbackStreamManager.scala | 4 +- .../wallet/callback/WalletCallbacks.scala | 6 ++- .../org/bitcoins/wallet/sync/WalletSync.scala | 4 +- .../org/bitcoins/zmq/ZMQSubscriber.scala | 4 +- .../org/bitcoins/zmq/ZMQSubscriberTest.scala | 6 +-- 80 files changed, 207 insertions(+), 210 deletions(-) create mode 100644 app-commons/src/main/scala/org/bitcoins/commons/util/BitcoinSLogger.scala diff --git a/app-commons/src/main/scala/org/bitcoins/commons/config/AppConfig.scala b/app-commons/src/main/scala/org/bitcoins/commons/config/AppConfig.scala index bcfdf8034b..0ec94a64a8 100644 --- a/app-commons/src/main/scala/org/bitcoins/commons/config/AppConfig.scala +++ b/app-commons/src/main/scala/org/bitcoins/commons/config/AppConfig.scala @@ -1,7 +1,7 @@ package org.bitcoins.commons.config import com.typesafe.config.{Config, ConfigFactory, ConfigParseOptions} -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.config._ import org.bitcoins.core.protocol.blockchain.BitcoinChainParams import org.bitcoins.core.util.StartStopAsync @@ -9,6 +9,7 @@ import org.bitcoins.core.util.StartStopAsync import java.nio.file._ import scala.concurrent.Future import org.bitcoins.core.compat.JavaConverters._ + import scala.util.Properties import scala.util.matching.Regex @@ -18,7 +19,7 @@ import scala.util.matching.Regex * @see [[https://github.com/bitcoin-s/bitcoin-s-core/blob/master/doc/configuration.md `configuration.md`]] * for more information. */ -abstract class AppConfig extends StartStopAsync[Unit] with Logging { +abstract class AppConfig extends StartStopAsync[Unit] with BitcoinSLogger { /** Starts this project. * After this future resolves, all operations should be @@ -62,7 +63,7 @@ abstract class AppConfig extends StartStopAsync[Unit] with Logging { */ def withOverrides(configOverrides: Vector[Config]): ConfigType = { val numOverrides = configOverrides.length - if (logger.logger.isDebugEnabled()) { + if (logger.isDebugEnabled()) { // force lazy evaluation before we print // our lines val oldConfStr = this.config.asReadableJson @@ -72,7 +73,7 @@ abstract class AppConfig extends StartStopAsync[Unit] with Logging { logger.trace(oldConfStr) } - if (logger.logger.isTraceEnabled()) { + if (logger.isTraceEnabled()) { configOverrides.zipWithIndex.foreach { case (c, idx) => logger.trace(s"Override no. $idx: ${c.asReadableJson}") } @@ -90,7 +91,7 @@ abstract class AppConfig extends StartStopAsync[Unit] with Logging { } // to avoid non-necessary lazy load - if (logger.logger.isDebugEnabled()) { + if (logger.isDebugEnabled()) { // force lazy load before we print val newConfStr = newConf.config.asReadableJson @@ -159,7 +160,7 @@ abstract class AppConfig extends StartStopAsync[Unit] with Logging { } } -object AppConfig extends Logging { +object AppConfig extends BitcoinSLogger { def safePathToString(path: Path): String = { val pathStr = path.toString.replace("\\", "/") diff --git a/app-commons/src/main/scala/org/bitcoins/commons/file/FileUtil.scala b/app-commons/src/main/scala/org/bitcoins/commons/file/FileUtil.scala index 3013b9ace5..b0c0ee2abb 100644 --- a/app-commons/src/main/scala/org/bitcoins/commons/file/FileUtil.scala +++ b/app-commons/src/main/scala/org/bitcoins/commons/file/FileUtil.scala @@ -1,6 +1,6 @@ package org.bitcoins.commons.file -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import java.io.{FileOutputStream, IOException} import java.nio.file.attribute.BasicFileAttributes @@ -9,7 +9,7 @@ import java.util.zip.{ZipEntry, ZipOutputStream} import scala.reflect.io.Directory import scala.util.matching.Regex -object FileUtil extends Logging { +object FileUtil extends BitcoinSLogger { /** Zips the [[directory]] into a zip file and then stores it at [[target]] * diff --git a/app-commons/src/main/scala/org/bitcoins/commons/rpc/Command.scala b/app-commons/src/main/scala/org/bitcoins/commons/rpc/Command.scala index fdb3147610..d0292ef995 100644 --- a/app-commons/src/main/scala/org/bitcoins/commons/rpc/Command.scala +++ b/app-commons/src/main/scala/org/bitcoins/commons/rpc/Command.scala @@ -1,10 +1,9 @@ package org.bitcoins.commons.rpc -import grizzled.slf4j.Logging import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts.LockUnspentOutputParameter import org.bitcoins.commons.jsonmodels.cli.ContractDescriptorParser import org.bitcoins.commons.serializers.JsonReaders -import org.bitcoins.commons.util.WalletNames +import org.bitcoins.commons.util.{BitcoinSLogger, WalletNames} import org.bitcoins.core.api.dlc.wallet.db.DLCContactDb import org.bitcoins.core.api.wallet.CoinSelectionAlgo import org.bitcoins.core.crypto.{ExtPrivateKey, MnemonicCode} @@ -1631,7 +1630,7 @@ case class LoadWallet( extends CommandRpc with AppServerCliCommand -object LoadWallet extends ServerJsonModels with Logging { +object LoadWallet extends ServerJsonModels with BitcoinSLogger { def fromJsArr(arr: ujson.Arr): Try[LoadWallet] = Try { arr.arr.toList match { diff --git a/app-commons/src/main/scala/org/bitcoins/commons/util/BitcoinSLogger.scala b/app-commons/src/main/scala/org/bitcoins/commons/util/BitcoinSLogger.scala new file mode 100644 index 0000000000..af92aa1d31 --- /dev/null +++ b/app-commons/src/main/scala/org/bitcoins/commons/util/BitcoinSLogger.scala @@ -0,0 +1,8 @@ +package org.bitcoins.commons.util + +import org.slf4j.{Logger, LoggerFactory} + +trait BitcoinSLogger { + + def logger: Logger = LoggerFactory.getLogger(getClass) +} diff --git a/app-commons/src/main/scala/org/bitcoins/commons/util/NativeProcessFactory.scala b/app-commons/src/main/scala/org/bitcoins/commons/util/NativeProcessFactory.scala index 8b5e8181e6..fe417c43ec 100644 --- a/app-commons/src/main/scala/org/bitcoins/commons/util/NativeProcessFactory.scala +++ b/app-commons/src/main/scala/org/bitcoins/commons/util/NativeProcessFactory.scala @@ -1,6 +1,5 @@ package org.bitcoins.commons.util -import grizzled.slf4j.Logging import org.bitcoins.core.util.FutureUtil import java.io.File @@ -8,7 +7,7 @@ import scala.concurrent.{ExecutionContext, Future} import scala.sys.process.{Process, ProcessBuilder, ProcessLogger} /** A trait that helps start bitcoind/eclair when it is started via bitcoin-s */ -trait NativeProcessFactory extends Logging { +trait NativeProcessFactory extends BitcoinSLogger { implicit protected def executionContext: ExecutionContext private[this] var processOpt: Option[Process] = None @@ -66,7 +65,7 @@ trait NativeProcessFactory extends Logging { } -object NativeProcessFactory extends Logging { +object NativeProcessFactory extends BitcoinSLogger { val processLogger: ProcessLogger = ProcessLogger(logger.info(_), logger.error(_)) diff --git a/app/cli/src/main/scala/org/bitcoins/cli/ConsoleCli.scala b/app/cli/src/main/scala/org/bitcoins/cli/ConsoleCli.scala index d1406a1992..6a0c7d26cd 100644 --- a/app/cli/src/main/scala/org/bitcoins/cli/ConsoleCli.scala +++ b/app/cli/src/main/scala/org/bitcoins/cli/ConsoleCli.scala @@ -1,12 +1,12 @@ package org.bitcoins.cli -import grizzled.slf4j.Logging import org.bitcoins.cli.CliCommand._ import org.bitcoins.cli.CliReaders._ import org.bitcoins.cli.ConsoleCli.RequestParam import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts.LockUnspentOutputParameter import org.bitcoins.commons.rpc._ import org.bitcoins.commons.serializers.Picklers._ +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.wallet.CoinSelectionAlgo import org.bitcoins.core.config.NetworkParameters import org.bitcoins.core.crypto._ @@ -42,7 +42,7 @@ import java.util.Date import scala.collection.mutable import scala.util.{Failure, Success, Try} -object ConsoleCli extends Logging { +object ConsoleCli extends BitcoinSLogger { def parser: OParser[Unit, Config] = { val builder = OParser.builder[Config] diff --git a/app/server-routes/src/main/scala/org/bitcoins/server/routes/BitcoinSRunner.scala b/app/server-routes/src/main/scala/org/bitcoins/server/routes/BitcoinSRunner.scala index a2d1df400b..cbdb25bdcf 100644 --- a/app/server-routes/src/main/scala/org/bitcoins/server/routes/BitcoinSRunner.scala +++ b/app/server-routes/src/main/scala/org/bitcoins/server/routes/BitcoinSRunner.scala @@ -1,13 +1,12 @@ package org.bitcoins.server.routes import org.apache.pekko.actor.ActorSystem -import grizzled.slf4j.Logging -import org.bitcoins.commons.util.ServerArgParser +import org.bitcoins.commons.util.{BitcoinSLogger, ServerArgParser} import org.bitcoins.core.util.{EnvUtil, StartStopAsync} import scala.concurrent.{ExecutionContext, Future} -trait BitcoinSRunner[T] extends StartStopAsync[T] with Logging { +trait BitcoinSRunner[T] extends StartStopAsync[T] with BitcoinSLogger { implicit def system: ActorSystem diff --git a/app/server-routes/src/main/scala/org/bitcoins/server/routes/HttpLogger.scala b/app/server-routes/src/main/scala/org/bitcoins/server/routes/HttpLogger.scala index dde816f72d..f225b98f34 100644 --- a/app/server-routes/src/main/scala/org/bitcoins/server/routes/HttpLogger.scala +++ b/app/server-routes/src/main/scala/org/bitcoins/server/routes/HttpLogger.scala @@ -1,6 +1,6 @@ package org.bitcoins.server.routes -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger /** Exposes access to the HTTP RPC server logger */ -private[bitcoins] trait HttpLogger extends Logging +private[bitcoins] trait HttpLogger extends BitcoinSLogger diff --git a/app/server-routes/src/main/scala/org/bitcoins/server/routes/Server.scala b/app/server-routes/src/main/scala/org/bitcoins/server/routes/Server.scala index f1bd2b5022..bea76400a3 100644 --- a/app/server-routes/src/main/scala/org/bitcoins/server/routes/Server.scala +++ b/app/server-routes/src/main/scala/org/bitcoins/server/routes/Server.scala @@ -1,7 +1,6 @@ package org.bitcoins.server.routes import de.heikoseeberger.akkahttpupickle.UpickleSupport._ -import grizzled.slf4j.Logging import org.apache.pekko.{Done, NotUsed} import org.apache.pekko.actor.ActorSystem import org.apache.pekko.event.Logging @@ -40,6 +39,7 @@ import org.apache.pekko.http.scaladsl.unmarshalling.FromRequestUnmarshaller import org.apache.pekko.stream.scaladsl.{Flow, Keep, Sink, Source} import org.bitcoins.commons.config.AppConfig import org.bitcoins.commons.jsonmodels.ws.WsNotification +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.server.util.{ServerBindings, WsServerConfig} import upickle.{default => up} @@ -245,7 +245,7 @@ case class Server( } -object Server extends Logging { +object Server extends BitcoinSLogger { // TODO id parameter case class Response( diff --git a/app/server-routes/src/main/scala/org/bitcoins/server/util/BitcoinSApp.scala b/app/server-routes/src/main/scala/org/bitcoins/server/util/BitcoinSApp.scala index e0e136e0f6..042c10b697 100644 --- a/app/server-routes/src/main/scala/org/bitcoins/server/util/BitcoinSApp.scala +++ b/app/server-routes/src/main/scala/org/bitcoins/server/util/BitcoinSApp.scala @@ -1,7 +1,7 @@ package org.bitcoins.server.util -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem +import org.bitcoins.commons.util.BitcoinSLogger trait BitcoinSApp { def actorSystemName: String @@ -15,6 +15,6 @@ trait BitcoinSApp { } /** Trait for using BitcoinS app with a daemon backend */ -trait BitcoinSAppScalaDaemon extends App with BitcoinSApp with Logging { +trait BitcoinSAppScalaDaemon extends App with BitcoinSApp with BitcoinSLogger { final override def commandLineArgs: Array[String] = args } diff --git a/app/server-routes/src/main/scala/org/bitcoins/server/util/ServerBindings.scala b/app/server-routes/src/main/scala/org/bitcoins/server/util/ServerBindings.scala index 917895dd50..2617d48ac4 100644 --- a/app/server-routes/src/main/scala/org/bitcoins/server/util/ServerBindings.scala +++ b/app/server-routes/src/main/scala/org/bitcoins/server/util/ServerBindings.scala @@ -1,7 +1,7 @@ package org.bitcoins.server.util -import grizzled.slf4j.Logging import org.apache.pekko.http.scaladsl.Http +import org.bitcoins.commons.util.BitcoinSLogger import scala.concurrent.duration.DurationInt import scala.concurrent.{ExecutionContext, Future} @@ -9,7 +9,7 @@ import scala.concurrent.{ExecutionContext, Future} case class ServerBindings( httpServer: Http.ServerBinding, webSocketServerOpt: Option[Http.ServerBinding]) - extends Logging { + extends BitcoinSLogger { private val terminateTimeout = 5.seconds diff --git a/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala b/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala index 9ddbbaad83..6f54684371 100644 --- a/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala +++ b/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala @@ -1,12 +1,11 @@ package org.bitcoins.server import com.typesafe.config.{Config, ConfigFactory} -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem import org.bitcoins.chain.config.ChainAppConfig import org.bitcoins.commons.config.AppConfig.DEFAULT_BITCOIN_S_CONF_FILE import org.bitcoins.commons.config.{AppConfig, ConfigOps} -import org.bitcoins.commons.util.ServerArgParser +import org.bitcoins.commons.util.{BitcoinSLogger, ServerArgParser} import org.bitcoins.core.config.NetworkParameters import org.bitcoins.core.util.{StartStopAsync, TimeUtil} import org.bitcoins.db.DbManagement @@ -41,7 +40,7 @@ case class BitcoinSAppConfig( baseDatadir: Path, configOverrides: Vector[Config])(implicit system: ActorSystem) extends StartStopAsync[AppConfigMarker] - with Logging { + with BitcoinSLogger { import system.dispatcher lazy val walletConf: WalletAppConfig = @@ -194,7 +193,7 @@ case class BitcoinSAppConfig( /** Implicit conversions that allow a unified configuration * to be passed in wherever a specializes one is required */ -object BitcoinSAppConfig extends Logging { +object BitcoinSAppConfig extends BitcoinSLogger { def fromConfig(config: Config)(implicit system: ActorSystem): BitcoinSAppConfig = { diff --git a/app/server/src/main/scala/org/bitcoins/server/BitcoindRpcBackendUtil.scala b/app/server/src/main/scala/org/bitcoins/server/BitcoindRpcBackendUtil.scala index e7c59fbeaf..26844525db 100644 --- a/app/server/src/main/scala/org/bitcoins/server/BitcoindRpcBackendUtil.scala +++ b/app/server/src/main/scala/org/bitcoins/server/BitcoindRpcBackendUtil.scala @@ -1,6 +1,5 @@ package org.bitcoins.server -import grizzled.slf4j.Logging import org.apache.pekko.actor.{ActorSystem, Cancellable} import org.apache.pekko.stream.OverflowStrategy import org.apache.pekko.stream.scaladsl.{ @@ -14,6 +13,7 @@ import org.apache.pekko.stream.scaladsl.{ import org.apache.pekko.{Done, NotUsed} import org.bitcoins.chain.ChainCallbacks import org.bitcoins.commons.jsonmodels.bitcoind.GetBlockHeaderResult +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.node.NodeApi import org.bitcoins.core.api.wallet.{NeutrinoHDWalletApi, WalletApi} import org.bitcoins.core.gcs.FilterType @@ -34,7 +34,7 @@ import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.concurrent.{ExecutionContext, Future, Promise} /** Useful utilities to use in the wallet project for syncing things against bitcoind */ -object BitcoindRpcBackendUtil extends Logging { +object BitcoindRpcBackendUtil extends BitcoinSLogger { /** Has the wallet process all the blocks it has not seen up until bitcoind's chain tip */ def syncWalletToBitcoind( diff --git a/app/server/src/main/scala/org/bitcoins/server/DLCWalletLoaderApi.scala b/app/server/src/main/scala/org/bitcoins/server/DLCWalletLoaderApi.scala index 235645e28e..e7c8b78a6c 100644 --- a/app/server/src/main/scala/org/bitcoins/server/DLCWalletLoaderApi.scala +++ b/app/server/src/main/scala/org/bitcoins/server/DLCWalletLoaderApi.scala @@ -1,7 +1,7 @@ package org.bitcoins.server -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.chain.ChainQueryApi import org.bitcoins.core.api.commons.ArgumentSource import org.bitcoins.core.api.dlc.wallet.DLCNeutrinoHDWalletApi @@ -25,7 +25,9 @@ import scala.concurrent.{ExecutionContext, Future} /** A trait used to help load a different load and discard the current wallet in memory * This trait encapsulates the heavy lifting done in the 'loadwallet' RPC command */ -sealed trait DLCWalletLoaderApi extends Logging with StartStopAsync[Unit] { +sealed trait DLCWalletLoaderApi + extends BitcoinSLogger + with StartStopAsync[Unit] { override def start(): Future[Unit] = Future.unit def conf: BitcoinSAppConfig 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 15629248d9..57aa8f1346 100644 --- a/app/server/src/main/scala/org/bitcoins/server/WalletRoutes.scala +++ b/app/server/src/main/scala/org/bitcoins/server/WalletRoutes.scala @@ -1,6 +1,5 @@ package org.bitcoins.server -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.scaladsl.model.HttpEntity import org.apache.pekko.http.scaladsl.server.Directives.complete @@ -8,6 +7,7 @@ import org.apache.pekko.http.scaladsl.server.Route import org.apache.pekko.stream.Materializer import org.bitcoins.commons.rpc._ import org.bitcoins.commons.serializers.Picklers._ +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.wallet.db.SpendingInfoDb import org.bitcoins.core.currency._ import org.bitcoins.core.protocol.tlv._ @@ -39,7 +39,7 @@ case class WalletRoutes(loadWalletApi: DLCWalletLoaderApi)(implicit system: ActorSystem, walletConf: WalletAppConfig) extends ServerRoute - with Logging { + with BitcoinSLogger { import system.dispatcher /** The loaded wallet that requests should be directed against */ diff --git a/app/server/src/main/scala/org/bitcoins/server/util/BitcoindPollingCancellabe.scala b/app/server/src/main/scala/org/bitcoins/server/util/BitcoindPollingCancellabe.scala index 5a9053734d..4391af0b56 100644 --- a/app/server/src/main/scala/org/bitcoins/server/util/BitcoindPollingCancellabe.scala +++ b/app/server/src/main/scala/org/bitcoins/server/util/BitcoindPollingCancellabe.scala @@ -1,13 +1,13 @@ package org.bitcoins.server.util -import grizzled.slf4j.Logging import org.apache.pekko.actor.Cancellable +import org.bitcoins.commons.util.BitcoinSLogger case class BitcoindPollingCancellable( blockPollingCancellable: Cancellable, mempoolPollingCancelable: Cancellable) extends Cancellable - with Logging { + with BitcoinSLogger { override def cancel(): Boolean = { logger.info(s"Cancelling bitcoind polling jobs") diff --git a/app/server/src/main/scala/org/bitcoins/server/util/CallbackUtil.scala b/app/server/src/main/scala/org/bitcoins/server/util/CallbackUtil.scala index dcac5d4092..4a753d75e4 100644 --- a/app/server/src/main/scala/org/bitcoins/server/util/CallbackUtil.scala +++ b/app/server/src/main/scala/org/bitcoins/server/util/CallbackUtil.scala @@ -1,8 +1,8 @@ package org.bitcoins.server.util -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem import org.apache.pekko.stream.scaladsl.{Sink, Source} +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.dlc.wallet.DLCNeutrinoHDWalletApi import org.bitcoins.core.api.wallet.{NeutrinoWalletApi, WalletApi} import org.bitcoins.core.gcs.GolombFilter @@ -15,7 +15,7 @@ import org.bitcoins.wallet.WalletNotInitialized import scala.concurrent.Future -object CallbackUtil extends Logging { +object CallbackUtil extends BitcoinSLogger { def createNeutrinoNodeCallbacksForWallet( wallet: WalletApi with NeutrinoWalletApi)(implicit diff --git a/app/server/src/main/scala/org/bitcoins/server/util/WebsocketUtil.scala b/app/server/src/main/scala/org/bitcoins/server/util/WebsocketUtil.scala index e92063cca3..5343c4cae6 100644 --- a/app/server/src/main/scala/org/bitcoins/server/util/WebsocketUtil.scala +++ b/app/server/src/main/scala/org/bitcoins/server/util/WebsocketUtil.scala @@ -1,6 +1,5 @@ package org.bitcoins.server.util -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem import org.apache.pekko.stream.scaladsl.SourceQueueWithComplete import org.bitcoins.chain.config.ChainAppConfig @@ -24,6 +23,7 @@ import org.bitcoins.commons.jsonmodels.ws.{ WalletWsType, WsNotification } +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.chain.ChainApi import org.bitcoins.core.api.chain.db.{CompactFilterDb, CompactFilterHeaderDb} import org.bitcoins.core.api.dlc.wallet.db.IncomingDLCOfferDb @@ -65,7 +65,7 @@ import org.bitcoins.wallet.callback.{ import scala.concurrent.{ExecutionContext, Future} -object WebsocketUtil extends Logging { +object WebsocketUtil extends BitcoinSLogger { private def sendHeadersToWs( notifications: Vector[ChainNotification[_]], diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala index 22f62d8ae0..536960ab86 100644 --- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala +++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala @@ -1,7 +1,7 @@ package org.bitcoins.rpc.client.common -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.chain.db.{ BlockHeaderDb, CompactFilterDb, @@ -385,7 +385,9 @@ object BitcoindRpcClient { sealed trait BitcoindVersion -object BitcoindVersion extends StringFactory[BitcoindVersion] with Logging { +object BitcoindVersion + extends StringFactory[BitcoindVersion] + with BitcoinSLogger { /** The newest version of `bitcoind` we support */ val newest: BitcoindVersion = V24 diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala index f406f91b2f..d3f322c8fa 100644 --- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala +++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala @@ -1,7 +1,6 @@ package org.bitcoins.rpc.client.common import com.fasterxml.jackson.core.JsonParseException -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.javadsl.model.headers.HttpCredentials import org.apache.pekko.http.scaladsl.{Http, HttpExt} @@ -18,7 +17,7 @@ import org.apache.pekko.stream.StreamTcpException import org.bitcoins.asyncutil.AsyncUtil import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts import org.bitcoins.commons.serializers.JsonSerializers._ -import org.bitcoins.commons.util.NativeProcessFactory +import org.bitcoins.commons.util.{BitcoinSLogger, NativeProcessFactory} import org.bitcoins.core.config._ import org.bitcoins.core.crypto.ECPrivateKeyUtil import org.bitcoins.core.util.StartStopAsync @@ -53,7 +52,7 @@ import scala.util.{Failure, Success} * and whether or not the client is started. */ trait Client - extends Logging + extends BitcoinSLogger with StartStopAsync[BitcoindRpcClient] with NativeProcessFactory { def version: Future[BitcoindVersion] diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindAuthCredentials.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindAuthCredentials.scala index 014cf80fb2..e75af046c9 100644 --- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindAuthCredentials.scala +++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindAuthCredentials.scala @@ -1,9 +1,10 @@ package org.bitcoins.rpc.config +import org.bitcoins.commons.util.BitcoinSLogger + import java.io.File import java.nio.file.{Files, Paths} import org.bitcoins.core.config._ -import grizzled.slf4j.Logging import org.bitcoins.crypto.MaskedToString /** This trait contains the information we need to authenticate @@ -15,7 +16,7 @@ sealed trait BitcoindAuthCredentials { def username: String } -object BitcoindAuthCredentials extends Logging { +object BitcoindAuthCredentials extends BitcoinSLogger { import org.bitcoins.core.compat.JavaConverters._ /** Authenticate by providing a username and password. diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindConfig.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindConfig.scala index f38453e88d..67c1cb9750 100644 --- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindConfig.scala +++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindConfig.scala @@ -1,6 +1,6 @@ package org.bitcoins.rpc.config -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.commons.ConfigFactory import org.bitcoins.core.config._ @@ -25,7 +25,7 @@ import scala.util.Properties case class BitcoindConfig( private[bitcoins] val lines: Seq[String], datadir: File) - extends Logging { + extends BitcoinSLogger { //create datadir and config if it DNE on disk if (!datadir.exists()) { @@ -285,7 +285,9 @@ case class BitcoindConfig( } -object BitcoindConfig extends ConfigFactory[BitcoindConfig] with Logging { +object BitcoindConfig + extends ConfigFactory[BitcoindConfig] + with BitcoinSLogger { /** The empty `bitcoind` config */ lazy val empty: BitcoindConfig = BitcoindConfig("", DEFAULT_DATADIR) diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala index 89d2743983..12a5a94304 100644 --- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala +++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala @@ -1,9 +1,8 @@ package org.bitcoins.rpc.config import com.typesafe.config.ConfigFactory -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem -import org.bitcoins.commons.util.NativeProcessFactory +import org.bitcoins.commons.util.{BitcoinSLogger, NativeProcessFactory} import org.bitcoins.core.api.commons.{InstanceFactory, InstanceFactoryLocal} import org.bitcoins.core.api.tor.Socks5ProxyParams import org.bitcoins.core.config.NetworkParameters @@ -17,7 +16,7 @@ import scala.util.{Failure, Properties, Success, Try} /** Created by chris on 4/29/17. */ -sealed trait BitcoindInstance extends Logging { +sealed trait BitcoindInstance extends BitcoinSLogger { def network: NetworkParameters def uri: URI diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/ZmqConfig.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/ZmqConfig.scala index 093cbbf4d7..efce4039bc 100644 --- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/ZmqConfig.scala +++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/ZmqConfig.scala @@ -1,8 +1,8 @@ package org.bitcoins.rpc.config -import java.net.InetSocketAddress +import org.bitcoins.commons.util.BitcoinSLogger -import grizzled.slf4j.Logging +import java.net.InetSocketAddress sealed trait ZmqConfig { def hashBlock: Option[InetSocketAddress] @@ -11,7 +11,7 @@ sealed trait ZmqConfig { def rawTx: Option[InetSocketAddress] } -object ZmqConfig extends Logging { +object ZmqConfig extends BitcoinSLogger { val empty: ZmqConfig = ZmqConfig() diff --git a/build.sbt b/build.sbt index e7e9ba8c28..5f75711e2a 100644 --- a/build.sbt +++ b/build.sbt @@ -543,7 +543,8 @@ lazy val zmq = project .settings(name := "bitcoin-s-zmq", libraryDependencies ++= Deps.bitcoindZmq.value) .dependsOn( - coreJVM % testAndCompile + coreJVM % testAndCompile, + appCommons ) def isCI = { diff --git a/chain/src/main/scala/org/bitcoins/chain/ChainCallbacks.scala b/chain/src/main/scala/org/bitcoins/chain/ChainCallbacks.scala index 34dac879e3..1d80c36f4e 100644 --- a/chain/src/main/scala/org/bitcoins/chain/ChainCallbacks.scala +++ b/chain/src/main/scala/org/bitcoins/chain/ChainCallbacks.scala @@ -1,14 +1,16 @@ package org.bitcoins.chain +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.callback.{CallbackFactory, ModuleCallbacks} import org.bitcoins.core.api.chain.db.{CompactFilterDb, CompactFilterHeaderDb} import org.bitcoins.core.api.{Callback, CallbackHandler} import org.bitcoins.core.protocol.blockchain.BlockHeader -import slick.util.Logging import scala.concurrent.{ExecutionContext, Future} -trait ChainCallbacks extends ModuleCallbacks[ChainCallbacks] with Logging { +trait ChainCallbacks + extends ModuleCallbacks[ChainCallbacks] + with BitcoinSLogger { def onBlockHeaderConnected: CallbackHandler[ Vector[(Int, BlockHeader)], diff --git a/chain/src/main/scala/org/bitcoins/chain/ChainVerificationLogger.scala b/chain/src/main/scala/org/bitcoins/chain/ChainVerificationLogger.scala index 591852040f..25cf54c349 100644 --- a/chain/src/main/scala/org/bitcoins/chain/ChainVerificationLogger.scala +++ b/chain/src/main/scala/org/bitcoins/chain/ChainVerificationLogger.scala @@ -1,6 +1,6 @@ package org.bitcoins.chain -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger /** Exposes access to the chain verification logger */ -private[bitcoins] trait ChainVerificationLogger extends Logging +private[bitcoins] trait ChainVerificationLogger extends BitcoinSLogger diff --git a/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/CLightningRpcClient.scala b/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/CLightningRpcClient.scala index ae4725bbd0..84a161cd1d 100644 --- a/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/CLightningRpcClient.scala +++ b/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/CLightningRpcClient.scala @@ -2,10 +2,9 @@ package com.bitcoins.clightning.rpc import com.bitcoins.clightning.rpc.CLightningRpcClient.feeRateToJson import com.bitcoins.clightning.rpc.config._ -import grizzled.slf4j.Logging import org.bitcoins.commons.jsonmodels.clightning.CLightningJsonModels._ import org.bitcoins.commons.serializers.JsonSerializers._ -import org.bitcoins.commons.util.NativeProcessFactory +import org.bitcoins.commons.util.{BitcoinSLogger, NativeProcessFactory} import org.bitcoins.core.currency.{CurrencyUnit, Satoshis} import org.bitcoins.core.hd.AddressType import org.bitcoins.core.protocol._ @@ -30,7 +29,7 @@ class CLightningRpcClient(val instance: CLightningInstanceLocal, binary: File)( extends CLightningUnixSocketHandler with NativeProcessFactory with StartStopAsync[CLightningRpcClient] - with Logging { + with BitcoinSLogger { // documentation: https://lightning.readthedocs.io/index.html diff --git a/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/config/CLightningConfig.scala b/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/config/CLightningConfig.scala index 6d588a487c..0b07a47ca9 100644 --- a/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/config/CLightningConfig.scala +++ b/clightning-rpc/src/main/scala/com/bitcoins/clightning/rpc/config/CLightningConfig.scala @@ -1,6 +1,6 @@ package com.bitcoins.clightning.rpc.config -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.commons.ConfigFactory import org.bitcoins.core.config._ import org.bitcoins.rpc.config.BitcoindAuthCredentials.PasswordBased @@ -24,7 +24,7 @@ import scala.util.Properties case class CLightningConfig( private[bitcoins] val lines: Seq[String], datadir: File) - extends Logging { + extends BitcoinSLogger { //create datadir and config if it DNE on disk if (!datadir.exists()) { @@ -142,7 +142,9 @@ case class CLightningConfig( ) } -object CLightningConfig extends ConfigFactory[CLightningConfig] with Logging { +object CLightningConfig + extends ConfigFactory[CLightningConfig] + with BitcoinSLogger { /** The empty `lightning` config */ override lazy val empty: CLightningConfig = diff --git a/db-commons/src/main/scala/org/bitcoins/db/CRUD.scala b/db-commons/src/main/scala/org/bitcoins/db/CRUD.scala index c519825e0c..1d0f4d2363 100644 --- a/db-commons/src/main/scala/org/bitcoins/db/CRUD.scala +++ b/db-commons/src/main/scala/org/bitcoins/db/CRUD.scala @@ -1,6 +1,6 @@ package org.bitcoins.db -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import slick.dbio.{DBIOAction, NoStream} import slick.lifted.AbstractTable @@ -134,7 +134,7 @@ abstract class CRUD[T, PrimaryKeyType](implicit } case class SafeDatabase(jdbcProfile: JdbcProfileComponent[DbAppConfig]) - extends Logging { + extends BitcoinSLogger { import jdbcProfile.database import jdbcProfile.profile.api.{ diff --git a/db-commons/src/main/scala/org/bitcoins/db/DbManagement.scala b/db-commons/src/main/scala/org/bitcoins/db/DbManagement.scala index da2288596f..a91cc292dc 100644 --- a/db-commons/src/main/scala/org/bitcoins/db/DbManagement.scala +++ b/db-commons/src/main/scala/org/bitcoins/db/DbManagement.scala @@ -1,6 +1,6 @@ package org.bitcoins.db -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.util.FutureUtil import org.bitcoins.db.DatabaseDriver._ import org.flywaydb.core.Flyway @@ -9,7 +9,7 @@ import org.flywaydb.core.api.{FlywayException, MigrationInfoService} import scala.concurrent.{ExecutionContext, Future} -trait DbManagement extends Logging { +trait DbManagement extends BitcoinSLogger { _: JdbcProfileComponent[DbAppConfig] => import profile.api._ diff --git a/db-commons/src/main/scala/org/bitcoins/db/HikariLogging.scala b/db-commons/src/main/scala/org/bitcoins/db/HikariLogging.scala index ade530f02d..6803f80b3a 100644 --- a/db-commons/src/main/scala/org/bitcoins/db/HikariLogging.scala +++ b/db-commons/src/main/scala/org/bitcoins/db/HikariLogging.scala @@ -2,7 +2,7 @@ package org.bitcoins.db import com.codahale.metrics.{Histogram, MetricRegistry} import com.zaxxer.hikari.{HikariDataSource, HikariPoolMXBean} -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.util._ import slick.jdbc.JdbcDataSource import slick.jdbc.hikaricp.HikariCPJdbcDataSource @@ -17,7 +17,7 @@ case class HikariLogging( hikariDataSource: HikariDataSource, moduleName: String, interval: Duration -) extends Logging +) extends BitcoinSLogger with StartStop[HikariLogging] { /** Logs thread activity */ @@ -163,8 +163,8 @@ case class HikariLogging( queueSize = slickMxBean.getQueueSize ) - logger.info(poolUsageUpdate) - logger.info(activityUpdate) + logger.info(poolUsageUpdate.toString) + logger.info(activityUpdate.toString) } private[this] var started: Boolean = false @@ -208,7 +208,7 @@ case class HikariLogging( } } -object HikariLogging extends Logging { +object HikariLogging extends BitcoinSLogger { private[db] val scheduler = Executors.newScheduledThreadPool(1) /** Returns a started hikari logger if configuration is correct, else None diff --git a/db-commons/src/main/scala/org/bitcoins/db/JdbcProfileComponent.scala b/db-commons/src/main/scala/org/bitcoins/db/JdbcProfileComponent.scala index dbd01034b9..7894a37fca 100644 --- a/db-commons/src/main/scala/org/bitcoins/db/JdbcProfileComponent.scala +++ b/db-commons/src/main/scala/org/bitcoins/db/JdbcProfileComponent.scala @@ -1,12 +1,12 @@ package org.bitcoins.db -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import slick.basic.DatabaseConfig import slick.jdbc.{JdbcBackend, JdbcProfile} import scala.concurrent.duration.Duration -trait JdbcProfileComponent[+ConfigType <: DbAppConfig] extends Logging { +trait JdbcProfileComponent[+ConfigType <: DbAppConfig] extends BitcoinSLogger { def appConfig: ConfigType diff --git a/db-commons/src/main/scala/org/bitcoins/db/SQLiteUtil.scala b/db-commons/src/main/scala/org/bitcoins/db/SQLiteUtil.scala index a35b05cc7f..4c40c384b7 100644 --- a/db-commons/src/main/scala/org/bitcoins/db/SQLiteUtil.scala +++ b/db-commons/src/main/scala/org/bitcoins/db/SQLiteUtil.scala @@ -1,12 +1,12 @@ package org.bitcoins.db -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import java.io.IOException import java.nio.file.{Files, LinkOption, Path} import scala.util.matching.Regex -object SQLiteUtil extends Logging { +object SQLiteUtil extends BitcoinSLogger { Class.forName("org.sqlite.JDBC") diff --git a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCConnectionHandler.scala b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCConnectionHandler.scala index 3cfd3f8615..a3becf9133 100644 --- a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCConnectionHandler.scala +++ b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCConnectionHandler.scala @@ -1,10 +1,10 @@ package org.bitcoins.dlc.node -import grizzled.slf4j.Logging import org.apache.pekko.actor.{Actor, ActorLogging, ActorRef, Props, Terminated} import org.apache.pekko.event.LoggingReceive import org.apache.pekko.io.Tcp import org.apache.pekko.util.ByteString +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.dlc.wallet.DLCWalletApi import org.bitcoins.core.protocol.BigSizeUInt import org.bitcoins.core.protocol.tlv._ @@ -132,7 +132,7 @@ class DLCConnectionHandler( } } -object DLCConnectionHandler extends Logging { +object DLCConnectionHandler extends BitcoinSLogger { case object CloseConnection case class WriteFailed(cause: Option[Throwable]) 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 1a369fb4b5..8b2cc95651 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 @@ -1,7 +1,7 @@ package org.bitcoins.dlc.node -import grizzled.slf4j.Logging import org.apache.pekko.actor.{ActorRef, ActorSystem} +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.dlc.node.DLCNodeApi import org.bitcoins.core.api.dlc.wallet.DLCWalletApi import org.bitcoins.core.api.node.Peer @@ -20,7 +20,7 @@ case class DLCNode(wallet: DLCWalletApi)(implicit system: ActorSystem, val config: DLCNodeAppConfig) extends DLCNodeApi - with Logging { + with BitcoinSLogger { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCNodeCallbacks.scala b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCNodeCallbacks.scala index 6ee738a5d0..3bfadef8c0 100644 --- a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCNodeCallbacks.scala +++ b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCNodeCallbacks.scala @@ -1,6 +1,6 @@ package org.bitcoins.dlc.node -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.callback.{CallbackFactory, ModuleCallbacks} import org.bitcoins.core.api.{Callback, CallbackHandler} import org.bitcoins.crypto.Sha256Digest @@ -9,7 +9,9 @@ import java.net.InetSocketAddress import scala.concurrent.{ExecutionContext, Future} /** Callbacks for responding to events in the DLC node. */ -trait DLCNodeCallbacks extends ModuleCallbacks[DLCNodeCallbacks] with Logging { +trait DLCNodeCallbacks + extends ModuleCallbacks[DLCNodeCallbacks] + with BitcoinSLogger { def onPeerConnectionInitiated: CallbackHandler[ InetSocketAddress, diff --git a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCServer.scala b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCServer.scala index b7727d8562..951d8a294d 100644 --- a/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCServer.scala +++ b/dlc-node/src/main/scala/org/bitcoins/dlc/node/DLCServer.scala @@ -1,6 +1,5 @@ package org.bitcoins.dlc.node -import grizzled.slf4j.Logging import org.apache.pekko.actor.{ Actor, ActorLogging, @@ -10,6 +9,7 @@ import org.apache.pekko.actor.{ } import org.apache.pekko.event.LoggingReceive import org.apache.pekko.io.{IO, Tcp} +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.dlc.wallet.DLCWalletApi import org.bitcoins.core.protocol.BigSizeUInt import org.bitcoins.tor._ @@ -78,7 +78,7 @@ class DLCServer( } -object DLCServer extends Logging { +object DLCServer extends BitcoinSLogger { case object Disconnect diff --git a/dlc-oracle/src/main/scala/org/bitcoins/dlc/oracle/DLCOracle.scala b/dlc-oracle/src/main/scala/org/bitcoins/dlc/oracle/DLCOracle.scala index 166927b91d..401f68d7dd 100644 --- a/dlc-oracle/src/main/scala/org/bitcoins/dlc/oracle/DLCOracle.scala +++ b/dlc-oracle/src/main/scala/org/bitcoins/dlc/oracle/DLCOracle.scala @@ -1,7 +1,7 @@ package org.bitcoins.dlc.oracle import com.typesafe.config.Config -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.dlcoracle._ import org.bitcoins.core.api.dlcoracle.db._ import org.bitcoins.core.config.{BitcoinNetwork, MainNet} @@ -36,7 +36,7 @@ import scala.concurrent.{ExecutionContext, Future} case class DLCOracle()(implicit val conf: DLCOracleAppConfig) extends DLCOracleApi - with Logging { + with BitcoinSLogger { implicit private val ec: ExecutionContext = conf.ec diff --git a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/callback/DLCWalletCallbackStreamManager.scala b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/callback/DLCWalletCallbackStreamManager.scala index b8190083d4..86a8f55862 100644 --- a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/callback/DLCWalletCallbackStreamManager.scala +++ b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/callback/DLCWalletCallbackStreamManager.scala @@ -1,6 +1,5 @@ package org.bitcoins.dlc.wallet.callback -import grizzled.slf4j.Logging import org.apache.pekko.Done import org.apache.pekko.actor.ActorSystem import org.apache.pekko.stream.OverflowStrategy @@ -10,6 +9,7 @@ import org.apache.pekko.stream.scaladsl.{ Source, SourceQueueWithComplete } +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.CallbackHandler import org.bitcoins.core.api.dlc.wallet.db.IncomingDLCOfferDb import org.bitcoins.core.protocol.dlc.models.DLCStatus @@ -25,7 +25,7 @@ case class DLCWalletCallbackStreamManager( maxBufferSize: Int = 16)(implicit system: ActorSystem) extends DLCWalletCallbacks with StartStopAsync[Unit] - with Logging { + with BitcoinSLogger { import system.dispatcher diff --git a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/callback/DLCWalletCallbacks.scala b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/callback/DLCWalletCallbacks.scala index 6056d4429c..68721b51f6 100644 --- a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/callback/DLCWalletCallbacks.scala +++ b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/callback/DLCWalletCallbacks.scala @@ -1,6 +1,6 @@ package org.bitcoins.dlc.wallet.callback -import grizzled.slf4j.{Logging} +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.callback.{CallbackFactory, ModuleCallbacks} import org.bitcoins.core.api.dlc.wallet.db.IncomingDLCOfferDb import org.bitcoins.core.api.{Callback, CallbackHandler} @@ -11,7 +11,7 @@ import scala.concurrent.{ExecutionContext, Future} trait DLCWalletCallbacks extends ModuleCallbacks[DLCWalletCallbacks] - with Logging { + with BitcoinSLogger { def onStateChange: CallbackHandler[DLCStatus, OnDLCStateChange] diff --git a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/internal/DLCDataManagement.scala b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/internal/DLCDataManagement.scala index 2c67e2100d..14f9c2e300 100644 --- a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/internal/DLCDataManagement.scala +++ b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/internal/DLCDataManagement.scala @@ -1,6 +1,6 @@ package org.bitcoins.dlc.wallet.internal -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.dlc.wallet.db.DLCDb import org.bitcoins.core.api.wallet.db.TransactionDb import org.bitcoins.core.hd._ @@ -12,7 +12,7 @@ import org.bitcoins.core.protocol.dlc.sign.DLCTxSigner import org.bitcoins.core.protocol.dlc.verify.DLCSignatureVerifier import org.bitcoins.core.protocol.script._ import org.bitcoins.core.protocol.tlv._ -import org.bitcoins.core.util.sorted.{OrderedAnnouncements} +import org.bitcoins.core.util.sorted.OrderedAnnouncements import org.bitcoins.core.wallet.utxo._ import org.bitcoins.crypto.Sha256Digest import org.bitcoins.db.SafeDatabase @@ -30,7 +30,7 @@ import scala.util.Try /** Handles fetching and constructing different DLC datastructures from the database */ case class DLCDataManagement(dlcWalletDAOs: DLCWalletDAOs)(implicit ec: ExecutionContext) - extends Logging { + extends BitcoinSLogger { val dlcDAO = dlcWalletDAOs.dlcDAO private val dlcAnnouncementDAO = dlcWalletDAOs.dlcAnnouncementDAO private val dlcInputsDAO = dlcWalletDAOs.dlcInputsDAO diff --git a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/util/DLCAcceptUtil.scala b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/util/DLCAcceptUtil.scala index ce70c2dc00..98c3696c3f 100644 --- a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/util/DLCAcceptUtil.scala +++ b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/util/DLCAcceptUtil.scala @@ -1,6 +1,6 @@ package org.bitcoins.dlc.wallet.util -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.dlc.wallet.db.DLCDb import org.bitcoins.core.api.wallet.db.AccountDb import org.bitcoins.core.config.NetworkParameters @@ -32,7 +32,7 @@ import scodec.bits.ByteVector import scala.concurrent.{ExecutionContext, Future} -object DLCAcceptUtil extends Logging { +object DLCAcceptUtil extends BitcoinSLogger { /** Builds an [[DLCAcceptWithoutSigs]] message from relevant data inside of the [[DLCWallet]] */ def buildAcceptWithoutSigs( diff --git a/fee-provider/src/main/scala/org/bitcoins/feeprovider/FeeProviderFactory.scala b/fee-provider/src/main/scala/org/bitcoins/feeprovider/FeeProviderFactory.scala index e6f19e3be3..3ea6df132d 100644 --- a/fee-provider/src/main/scala/org/bitcoins/feeprovider/FeeProviderFactory.scala +++ b/fee-provider/src/main/scala/org/bitcoins/feeprovider/FeeProviderFactory.scala @@ -1,7 +1,7 @@ package org.bitcoins.feeprovider -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.feeprovider.FeeRateApi import org.bitcoins.core.api.tor.Socks5ProxyParams import org.bitcoins.core.config.BitcoinNetwork @@ -20,7 +20,7 @@ trait FeeProviderFactory[T <: FeeRateApi] { implicit system: ActorSystem): T } -object FeeProviderFactory extends Logging { +object FeeProviderFactory extends BitcoinSLogger { /** Gets a Fee Provider from the given wallet app config * Returns default if there is no config set diff --git a/key-manager/src/main/scala/org/bitcoins/keymanager/KeyManagerLogger.scala b/key-manager/src/main/scala/org/bitcoins/keymanager/KeyManagerLogger.scala index 73626317c8..816c98d8a7 100644 --- a/key-manager/src/main/scala/org/bitcoins/keymanager/KeyManagerLogger.scala +++ b/key-manager/src/main/scala/org/bitcoins/keymanager/KeyManagerLogger.scala @@ -1,6 +1,6 @@ package org.bitcoins.keymanager -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger /** Exposes access to the key manager logger */ -private[bitcoins] trait KeyManagerLogger extends Logging +private[bitcoins] trait KeyManagerLogger extends BitcoinSLogger diff --git a/key-manager/src/main/scala/org/bitcoins/keymanager/bip39/BIP39KeyManager.scala b/key-manager/src/main/scala/org/bitcoins/keymanager/bip39/BIP39KeyManager.scala index 27d8107688..051b07f8f8 100644 --- a/key-manager/src/main/scala/org/bitcoins/keymanager/bip39/BIP39KeyManager.scala +++ b/key-manager/src/main/scala/org/bitcoins/keymanager/bip39/BIP39KeyManager.scala @@ -1,6 +1,6 @@ package org.bitcoins.keymanager.bip39 -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.keymanager.{ BIP39KeyManagerApi, BIP39KeyManagerCreateApi, @@ -70,7 +70,7 @@ class BIP39KeyManager( object BIP39KeyManager extends BIP39KeyManagerCreateApi[BIP39KeyManager] - with Logging { + with BitcoinSLogger { def fromMnemonic( mnemonic: MnemonicCode, diff --git a/key-manager/src/main/scala/org/bitcoins/keymanager/bip39/BIP39LockedKeyManager.scala b/key-manager/src/main/scala/org/bitcoins/keymanager/bip39/BIP39LockedKeyManager.scala index 70fef955b9..ed0afcfdfe 100644 --- a/key-manager/src/main/scala/org/bitcoins/keymanager/bip39/BIP39LockedKeyManager.scala +++ b/key-manager/src/main/scala/org/bitcoins/keymanager/bip39/BIP39LockedKeyManager.scala @@ -1,5 +1,6 @@ package org.bitcoins.keymanager.bip39 +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.wallet.keymanagement.{ KeyManagerParams, KeyManagerUnlockError @@ -10,10 +11,9 @@ import org.bitcoins.keymanager.ReadMnemonicError.{ JsonParsingError } import org.bitcoins.keymanager._ -import grizzled.slf4j.Logging /** Represents a */ -object BIP39LockedKeyManager extends Logging { +object BIP39LockedKeyManager extends BitcoinSLogger { /** Unlock the wallet by decrypting the [[EncryptedMnemonic]] seed * @param passphrase the password to decrypt the wallet diff --git a/lnd-rpc/src/main/scala/org/bitcoins/lnd/rpc/LndRpcClient.scala b/lnd-rpc/src/main/scala/org/bitcoins/lnd/rpc/LndRpcClient.scala index 029735755b..3ef3b93c86 100644 --- a/lnd-rpc/src/main/scala/org/bitcoins/lnd/rpc/LndRpcClient.scala +++ b/lnd-rpc/src/main/scala/org/bitcoins/lnd/rpc/LndRpcClient.scala @@ -5,7 +5,6 @@ import org.apache.pekko.actor.ActorSystem import org.apache.pekko.stream.scaladsl.{Sink, Source} import chainrpc._ import com.google.protobuf.ByteString -import grizzled.slf4j.Logging import invoicesrpc.LookupInvoiceMsg.InvoiceRef import invoicesrpc._ import io.grpc.{CallCredentials, Metadata} @@ -14,7 +13,7 @@ import lnrpc.CloseStatusUpdate.Update.{ChanClose, ClosePending} import lnrpc._ import org.apache.pekko.grpc.{GrpcClientSettings, SSLContextUtils} import org.bitcoins.commons.jsonmodels.lnd._ -import org.bitcoins.commons.util.NativeProcessFactory +import org.bitcoins.commons.util.{BitcoinSLogger, NativeProcessFactory} import org.bitcoins.core.currency._ import org.bitcoins.core.number._ import org.bitcoins.core.protocol._ @@ -68,7 +67,7 @@ class LndRpcClient(val instance: LndInstance, binaryOpt: Option[File] = None)( with LndUtils with LndRouterClient with StartStopAsync[LndRpcClient] - with Logging { + with BitcoinSLogger { instance match { case _: LndInstanceLocal => require(binaryOpt.isDefined, diff --git a/lnd-rpc/src/main/scala/org/bitcoins/lnd/rpc/config/LndConfig.scala b/lnd-rpc/src/main/scala/org/bitcoins/lnd/rpc/config/LndConfig.scala index c70f89f70e..2b5f00c70b 100644 --- a/lnd-rpc/src/main/scala/org/bitcoins/lnd/rpc/config/LndConfig.scala +++ b/lnd-rpc/src/main/scala/org/bitcoins/lnd/rpc/config/LndConfig.scala @@ -1,6 +1,6 @@ package org.bitcoins.lnd.rpc.config -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.commons.ConfigFactory import org.bitcoins.core.config._ import scodec.bits.ByteVector @@ -22,7 +22,7 @@ import scala.util.Properties * requests. */ case class LndConfig(private[bitcoins] val lines: Seq[String], datadir: File) - extends Logging { + extends BitcoinSLogger { //create datadir and config if it DNE on disk if (!datadir.exists()) { @@ -170,7 +170,7 @@ case class LndConfig(private[bitcoins] val lines: Seq[String], datadir: File) } } -object LndConfig extends ConfigFactory[LndConfig] with Logging { +object LndConfig extends ConfigFactory[LndConfig] with BitcoinSLogger { /** The empty `lnd` config */ override lazy val empty: LndConfig = LndConfig("", DEFAULT_DATADIR) diff --git a/lnurl/src/main/scala/org/bitcoins/lnurl/LnURLClient.scala b/lnurl/src/main/scala/org/bitcoins/lnurl/LnURLClient.scala index ea10e5d56c..2f81423523 100644 --- a/lnurl/src/main/scala/org/bitcoins/lnurl/LnURLClient.scala +++ b/lnurl/src/main/scala/org/bitcoins/lnurl/LnURLClient.scala @@ -1,12 +1,12 @@ package org.bitcoins.lnurl -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.scaladsl.Http import org.apache.pekko.http.scaladsl.client.RequestBuilding.Get import org.apache.pekko.http.scaladsl.model.{HttpRequest, MediaTypes} import org.apache.pekko.http.scaladsl.model.headers.Accept import org.apache.pekko.util.ByteString +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.tor.Socks5ProxyParams import org.bitcoins.core.currency._ import org.bitcoins.core.protocol.ln.LnInvoice @@ -21,7 +21,7 @@ import scala.concurrent._ class LnURLClient(proxyParams: Option[Socks5ProxyParams])(implicit system: ActorSystem) - extends Logging { + extends BitcoinSLogger { implicit protected val ec: ExecutionContext = system.dispatcher private val http = Http(system) diff --git a/node/src/main/scala/org/bitcoins/node/NodeCallbacks.scala b/node/src/main/scala/org/bitcoins/node/NodeCallbacks.scala index 9c0ffbcc88..ea3d99276a 100644 --- a/node/src/main/scala/org/bitcoins/node/NodeCallbacks.scala +++ b/node/src/main/scala/org/bitcoins/node/NodeCallbacks.scala @@ -1,7 +1,7 @@ package org.bitcoins.node -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.callback.{CallbackFactory, ModuleCallbacks} import org.bitcoins.core.api.{Callback, Callback2, CallbackHandler} import org.bitcoins.core.gcs.GolombFilter @@ -16,7 +16,7 @@ import scala.concurrent.{ExecutionContext, Future} * The appropriate callback is executed whenever the node receives * a `getdata` message matching it. */ -trait NodeCallbacks extends ModuleCallbacks[NodeCallbacks] with Logging { +trait NodeCallbacks extends ModuleCallbacks[NodeCallbacks] with BitcoinSLogger { def onCompactFiltersReceived: CallbackHandler[ Vector[(DoubleSha256DigestBE, GolombFilter)], diff --git a/node/src/main/scala/org/bitcoins/node/P2PLogger.scala b/node/src/main/scala/org/bitcoins/node/P2PLogger.scala index f4dbcd06b0..4558753456 100644 --- a/node/src/main/scala/org/bitcoins/node/P2PLogger.scala +++ b/node/src/main/scala/org/bitcoins/node/P2PLogger.scala @@ -1,6 +1,6 @@ package org.bitcoins.node -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger /** Exposes access to the P2P submodule logger */ -private[bitcoins] trait P2PLogger extends Logging +private[bitcoins] trait P2PLogger extends BitcoinSLogger diff --git a/node/src/main/scala/org/bitcoins/node/PeerManager.scala b/node/src/main/scala/org/bitcoins/node/PeerManager.scala index d3dde1736c..8adcc666d6 100644 --- a/node/src/main/scala/org/bitcoins/node/PeerManager.scala +++ b/node/src/main/scala/org/bitcoins/node/PeerManager.scala @@ -1,12 +1,12 @@ package org.bitcoins.node -import grizzled.slf4j.Logging import org.apache.pekko.Done import org.apache.pekko.stream.scaladsl.{Sink, SourceQueue} import org.bitcoins.asyncutil.AsyncUtil import org.bitcoins.chain.blockchain.ChainHandler import org.bitcoins.chain.config.ChainAppConfig import org.bitcoins.chain.models.BlockHeaderDAO +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.chain.ChainApi import org.bitcoins.core.api.chain.db.{ BlockHeaderDb, @@ -1084,7 +1084,7 @@ case class PeerManager( case class ResponseTimeout(payload: NetworkPayload) -object PeerManager extends Logging { +object PeerManager extends BitcoinSLogger { /** Sends first getcfheader message. * Returns None if are our filter headers are in sync with our block headers or diff --git a/node/src/main/scala/org/bitcoins/node/callback/NodeCallbackStreamManager.scala b/node/src/main/scala/org/bitcoins/node/callback/NodeCallbackStreamManager.scala index 0c038539d1..7a8180544a 100644 --- a/node/src/main/scala/org/bitcoins/node/callback/NodeCallbackStreamManager.scala +++ b/node/src/main/scala/org/bitcoins/node/callback/NodeCallbackStreamManager.scala @@ -1,6 +1,5 @@ package org.bitcoins.node.callback -import grizzled.slf4j.Logging import org.apache.pekko.Done import org.apache.pekko.actor.ActorSystem import org.apache.pekko.stream.OverflowStrategy @@ -10,6 +9,7 @@ import org.apache.pekko.stream.scaladsl.{ Source, SourceQueueWithComplete } +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.CallbackHandler import org.bitcoins.core.gcs.GolombFilter import org.bitcoins.core.protocol.blockchain.{Block, BlockHeader, MerkleBlock} @@ -28,7 +28,7 @@ case class NodeCallbackStreamManager( maxBufferSize: Int = 16)(implicit system: ActorSystem) extends NodeCallbacks with StartStopAsync[Unit] - with Logging { + with BitcoinSLogger { import system.dispatcher private val filterQueueSource: Source[ diff --git a/project/Deps.scala b/project/Deps.scala index b0ba59ff43..a5548b48f8 100644 --- a/project/Deps.scala +++ b/project/Deps.scala @@ -14,7 +14,6 @@ object Deps { val logkitV = "20020529" val avalonLoggingV = "20020627" - val grizzledSlf4j = "1.3.4" val scalacheck = "1.17.0" val scalaTest = "3.2.18" //https://www.scalatest.org/ @@ -178,9 +177,6 @@ object Deps { val avalonLogging = "avalon-framework" % "avalon-framework" % V.avalonLoggingV //https://github.com/apache/commons-logging/blob/0d4f2604ada038fd95e714d504d2278f1bd5814a/pom.xml#L498 - val grizzledSlf4j = - "org.clapper" %% "grizzled-slf4j" % V.grizzledSlf4j withSources () withJavadoc () - val codehaus = "org.codehaus.janino" % "janino" % V.codehausV //for loading secp256k1 natively @@ -261,7 +257,6 @@ object Deps { val junitInterface = "com.github.sbt" % "junit-interface" % V.junitV % "test" withSources () withJavadoc () val logback = Compile.logback % "test" - val grizzledSlf4j = Compile.grizzledSlf4j % "test" val scalacheck = Def.setting( "org.scalacheck" %%% "scalacheck" % V.scalacheck % "test" withSources () withJavadoc ()) @@ -310,7 +305,6 @@ object Deps { Compile.newMicroPickle.value, Compile.playJson, Compile.slf4j, - Compile.grizzledSlf4j, Compile.typesafeConfig ) } @@ -337,14 +331,12 @@ object Deps { val dlcWallet = List( - Compile.newMicroJson, - Compile.grizzledSlf4j + Compile.newMicroJson ) val dlcNode = List( Compile.newMicroJson, - Compile.grizzledSlf4j, Compile.akkaActor ) @@ -399,7 +391,6 @@ object Deps { List( Compile.zeromq, Compile.slf4j, - Compile.grizzledSlf4j, Test.logback, Test.scalacheck.value, Test.scalaTest.value @@ -410,8 +401,7 @@ object Deps { Compile.akkaHttp, Compile.akkaStream, Compile.typesafeConfig, - Compile.slf4j, - Compile.grizzledSlf4j + Compile.slf4j ) def bitcoindRpcTest = Def.setting { @@ -441,7 +431,6 @@ object Deps { Compile.postgres, Compile.slickHikari, Compile.slf4j, - Compile.grizzledSlf4j, Test.scalaTest.value, Test.pgEmbedded ) @@ -511,14 +500,12 @@ object Deps { Compile.akkaHttp, Compile.akkaStream, Compile.playJson, - Compile.slf4j, - Compile.grizzledSlf4j + Compile.slf4j ) val clightningRpc = List( Compile.jUnixSocket, - Compile.playJson, - Compile.grizzledSlf4j + Compile.playJson ) val clightningRpcTest = Def.setting { @@ -533,8 +520,7 @@ object Deps { List( Compile.akkaStream, Compile.akkaHttp, - Compile.scodec.value, - Compile.grizzledSlf4j + Compile.scodec.value ) } @@ -546,8 +532,7 @@ object Deps { Compile.akkaDiscovery, Compile.pekkoGrpc, Compile.playJson, - Compile.slf4j, - Compile.grizzledSlf4j + Compile.slf4j ) def eclairRpcTest = Def.setting { @@ -596,8 +581,7 @@ object Deps { Compile.slick, Compile.slickHikari, Compile.sqlite, - Compile.slf4j, - Compile.grizzledSlf4j + Compile.slf4j ) val nodeTest = Def.setting { @@ -625,7 +609,6 @@ object Deps { Compile.scalaTestPlus.value, Compile.pgEmbedded, Compile.slf4j, - Compile.grizzledSlf4j, Compile.akkaTestkit ) } @@ -645,7 +628,6 @@ object Deps { Compile.newMicroJson, Compile.logback, Compile.slf4j, - Compile.grizzledSlf4j, Compile.akkaActor, Compile.akkaStream ) @@ -673,8 +655,7 @@ object Deps { List( Compile.newMicroJson, Compile.logback, - Compile.slf4j, - Compile.grizzledSlf4j + Compile.slf4j ) val dlcOracleTest = @@ -688,7 +669,6 @@ object Deps { Compile.akkaActor, Compile.akkaSlf4j, Compile.akkaStream, - Compile.slf4j, - Compile.grizzledSlf4j + Compile.slf4j ) } diff --git a/testkit/src/main/scala/org/bitcoins/testkit/chain/SyncUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/chain/SyncUtil.scala index a9242ec423..42db4dc269 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/chain/SyncUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/chain/SyncUtil.scala @@ -1,6 +1,5 @@ package org.bitcoins.testkit.chain -import grizzled.slf4j.Logging import org.apache.pekko.actor.ActorSystem import org.bitcoins.chain.blockchain.ChainHandler import org.bitcoins.chain.blockchain.sync.{ @@ -10,6 +9,7 @@ import org.bitcoins.chain.blockchain.sync.{ } import org.bitcoins.chain.config.ChainAppConfig import org.bitcoins.commons.jsonmodels.bitcoind.GetBlockFilterResult +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.node import org.bitcoins.core.api.node.{NodeApi, NodeChainQueryApi} import org.bitcoins.core.api.wallet.WalletApi @@ -32,7 +32,7 @@ import org.bitcoins.wallet.sync.WalletSync import scala.concurrent.{ExecutionContext, Future} /** Useful utilities to use in the chain project for syncing things against bitcoind */ -abstract class SyncUtil extends Logging { +abstract class SyncUtil extends BitcoinSLogger { /** Creates a function that will retrun bitcoin's best block hash when called */ def getBestBlockHashFunc( diff --git a/testkit/src/main/scala/org/bitcoins/testkit/clightning/CLightningRpcTestUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/clightning/CLightningRpcTestUtil.scala index 9ab7088e3f..b0609bfad8 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/clightning/CLightningRpcTestUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/clightning/CLightningRpcTestUtil.scala @@ -3,8 +3,8 @@ package org.bitcoins.testkit.clightning import org.apache.pekko.actor.ActorSystem import com.bitcoins.clightning.rpc.CLightningRpcClient import com.bitcoins.clightning.rpc.config.CLightningInstanceLocal -import grizzled.slf4j.Logging import org.bitcoins.commons.jsonmodels.clightning.CLightningJsonModels.FundChannelResult +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.currency._ import org.bitcoins.core.protocol.ln.node.NodeId import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte @@ -22,7 +22,7 @@ import scala.concurrent.duration.DurationInt import scala.concurrent.{ExecutionContext, Future} import scala.util.Properties -trait CLightningRpcTestUtil extends Logging { +trait CLightningRpcTestUtil extends BitcoinSLogger { val sbtBinaryDirectory: Path = TestkitBinaries.baseBinaryDirectory.resolve("clightning") diff --git a/testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala index 2f8f716bae..47c93d6209 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala @@ -2,13 +2,13 @@ package org.bitcoins.testkit.eclair.rpc import org.apache.pekko.actor.ActorSystem import com.typesafe.config.{Config, ConfigFactory} -import grizzled.slf4j.Logging import org.bitcoins.commons.jsonmodels.eclair.{ IncomingPaymentStatus, OutgoingPayment, OutgoingPaymentStatus, PaymentId } +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.compat.JavaConverters._ import org.bitcoins.core.currency.{CurrencyUnit, Satoshis} import org.bitcoins.core.protocol.ln.channel.{ @@ -51,7 +51,7 @@ import scala.util.{Failure, Success} * Each double sided arrow represents a P2P connection as well as a funded * channel */ -trait EclairRpcTestUtil extends Logging { +trait EclairRpcTestUtil extends BitcoinSLogger { def randomEclairDatadir(): File = new File(s"/tmp/eclair-test/${FileUtil.randomDirName}/.eclair/") diff --git a/testkit/src/main/scala/org/bitcoins/testkit/lnd/LndRpcTestUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/lnd/LndRpcTestUtil.scala index 0c73b27c66..cdac3baa4e 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/lnd/LndRpcTestUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/lnd/LndRpcTestUtil.scala @@ -1,8 +1,8 @@ package org.bitcoins.testkit.lnd import org.apache.pekko.actor.ActorSystem -import grizzled.slf4j.Logging import org.bitcoins.asyncutil.AsyncUtil +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.currency.{Bitcoins, CurrencyUnit, Satoshis} import org.bitcoins.core.number.UInt32 import org.bitcoins.core.protocol.ln.node.NodeId @@ -29,7 +29,7 @@ import scala.concurrent.duration.DurationInt import scala.concurrent.{ExecutionContext, Future} import scala.util.Properties -trait LndRpcTestUtil extends Logging { +trait LndRpcTestUtil extends BitcoinSLogger { val sbtBinaryDirectory: Path = TestkitBinaries.baseBinaryDirectory.resolve("lnd") diff --git a/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala index 84f83bc5af..b637abdfba 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala @@ -1,7 +1,6 @@ package org.bitcoins.testkit.rpc import org.apache.pekko.actor.ActorSystem -import grizzled.slf4j.Logging import org.bitcoins.asyncutil.AsyncUtil import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts.AddNodeArgument import org.bitcoins.commons.jsonmodels.bitcoind.{ @@ -10,6 +9,7 @@ import org.bitcoins.commons.jsonmodels.bitcoind.{ RpcOpts, SignRawTransactionResult } +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.compat.JavaConverters._ import org.bitcoins.core.config.RegTest import org.bitcoins.core.currency.Bitcoins @@ -48,7 +48,7 @@ import scala.concurrent.duration.{DurationInt, FiniteDuration} import scala.util._ //noinspection AccessorLikeMethodIsEmptyParen -trait BitcoindRpcTestUtil extends Logging { +trait BitcoindRpcTestUtil extends BitcoinSLogger { lazy val network: RegTest.type = RegTest diff --git a/testkit/src/main/scala/org/bitcoins/testkit/util/BitcoinSAsyncTest.scala b/testkit/src/main/scala/org/bitcoins/testkit/util/BitcoinSAsyncTest.scala index 5e41208fda..c5ebf45622 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/util/BitcoinSAsyncTest.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/util/BitcoinSAsyncTest.scala @@ -2,8 +2,8 @@ package org.bitcoins.testkit.util import org.apache.pekko.actor.ActorSystem import org.apache.pekko.util.Timeout -import grizzled.slf4j.Logging import org.apache.pekko.testkit.TestKit +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.config.NetworkParameters import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil import org.bitcoins.testkitcore.util.BaseAsyncTest @@ -15,7 +15,7 @@ import scala.concurrent.ExecutionContext /** A bitcoin-s async test trait, that uses akka's actor system * execution context to run the scalatest test suites */ -trait BitcoinSPekkoAsyncTest extends BaseAsyncTest with Logging { +trait BitcoinSPekkoAsyncTest extends BaseAsyncTest with BitcoinSLogger { this: AsyncTestSuite => implicit lazy val akkaTimeout: Timeout = Timeout(duration) diff --git a/testkit/src/main/scala/org/bitcoins/testkit/util/BitcoindRpcTest.scala b/testkit/src/main/scala/org/bitcoins/testkit/util/BitcoindRpcTest.scala index ff3d5b30de..faff3aa44a 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/util/BitcoindRpcTest.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/util/BitcoindRpcTest.scala @@ -1,6 +1,6 @@ package org.bitcoins.testkit.util -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import java.nio.file.Files import org.bitcoins.rpc.client.common.BitcoindRpcClient @@ -9,7 +9,8 @@ import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil import scala.collection.mutable import scala.concurrent.{Await, Future} -trait BitcoindRpcBaseTest extends Logging { this: BitcoinSPekkoAsyncTest => +trait BitcoindRpcBaseTest extends BitcoinSLogger { + this: BitcoinSPekkoAsyncTest => private val dirExists = Files.exists(BitcoindRpcTestClient.sbtBinaryDirectory) diff --git a/testkit/src/main/scala/org/bitcoins/testkit/util/FileUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/util/FileUtil.scala index cf8de2ec3b..dc73a166c2 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/util/FileUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/util/FileUtil.scala @@ -1,13 +1,13 @@ package org.bitcoins.testkit.util -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import java.io.File import java.nio.file.{Files, Path, Paths} import scala.annotation.tailrec import scala.util.{Properties, Random} -object FileUtil extends Logging { +object FileUtil extends BitcoinSLogger { /** Returns a `BufferedSource` for any file on the classpath */ def getFileAsSource(fileName: String): scala.io.BufferedSource = { diff --git a/testkit/src/main/scala/org/bitcoins/testkit/util/RpcBinaryUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/util/RpcBinaryUtil.scala index c0618697bf..2dc4608415 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/util/RpcBinaryUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/util/RpcBinaryUtil.scala @@ -1,15 +1,15 @@ package org.bitcoins.testkit.util +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.config.RegTest import org.bitcoins.core.util.StartStopAsync -import grizzled.slf4j.Logging import java.nio.file.Path /** A utility trait for handling binaries like bitcoind/eclair. * All common utility methods should go in this trait */ -trait RpcBinaryUtil[T] extends StartStopAsync[T] with Logging { +trait RpcBinaryUtil[T] extends StartStopAsync[T] with BitcoinSLogger { /** The path to the binary, an example is * '/home/suredbits/.bitcoin-s/binaries/bitcoind/bitcoin-0.20.1/bin/bitcoind' diff --git a/testkit/src/main/scala/org/bitcoins/testkit/util/TorUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/util/TorUtil.scala index dee9496c38..da2ac6e96b 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/util/TorUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/util/TorUtil.scala @@ -1,13 +1,13 @@ package org.bitcoins.testkit.util -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.util.NetworkUtil.portIsBound import org.bitcoins.tor.TorParams import java.net.{InetAddress, InetSocketAddress} import scala.util.Properties -object TorUtil extends Logging { +object TorUtil extends BitcoinSLogger { val torEnabled: Boolean = Properties .envOrNone("TOR") diff --git a/testkit/src/main/scala/org/bitcoins/testkit/wallet/DLCWalletUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/wallet/DLCWalletUtil.scala index 4a03281b7d..6572be0126 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/wallet/DLCWalletUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/wallet/DLCWalletUtil.scala @@ -1,6 +1,6 @@ package org.bitcoins.testkit.wallet -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.dlc.wallet.db.DLCDb import org.bitcoins.core.crypto.WitnessTxSigComponent import org.bitcoins.core.currency._ @@ -35,7 +35,7 @@ import scodec.bits.ByteVector import java.time.Instant import scala.concurrent.{ExecutionContext, Future} -object DLCWalletUtil extends Logging { +object DLCWalletUtil extends BitcoinSLogger { lazy val oraclePrivKey: ECPrivateKey = ECPrivateKey.freshPrivateKey lazy val kValues: Vector[ECPrivateKey] = { diff --git a/testkit/src/main/scala/org/bitcoins/testkit/wallet/FundWalletUtil.scala b/testkit/src/main/scala/org/bitcoins/testkit/wallet/FundWalletUtil.scala index b2414d0331..64cd113467 100644 --- a/testkit/src/main/scala/org/bitcoins/testkit/wallet/FundWalletUtil.scala +++ b/testkit/src/main/scala/org/bitcoins/testkit/wallet/FundWalletUtil.scala @@ -1,7 +1,7 @@ package org.bitcoins.testkit.wallet import org.apache.pekko.actor.ActorSystem -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.chain.ChainQueryApi import org.bitcoins.core.api.node.NodeApi import org.bitcoins.core.api.wallet.HDWalletApi @@ -27,7 +27,7 @@ import org.bitcoins.wallet.config.WalletAppConfig import scala.concurrent.{ExecutionContext, Future} -trait FundWalletUtil extends Logging { +trait FundWalletUtil extends BitcoinSLogger { /** Funds the given wallet with money from the given bitcoind */ def fundWalletWithBitcoind[T <: WalletWithBitcoind[_ <: BitcoindRpcClient]]( diff --git a/tor/src/main/scala/org/bitcoins/tor/Socks5ClientTransport.scala b/tor/src/main/scala/org/bitcoins/tor/Socks5ClientTransport.scala index 9be18e2578..565e932971 100644 --- a/tor/src/main/scala/org/bitcoins/tor/Socks5ClientTransport.scala +++ b/tor/src/main/scala/org/bitcoins/tor/Socks5ClientTransport.scala @@ -1,6 +1,5 @@ package org.bitcoins.tor -import grizzled.slf4j.Logging import org.apache.pekko.NotUsed import org.apache.pekko.actor.ActorSystem import org.apache.pekko.http.scaladsl.ClientTransport.TCP @@ -18,6 +17,7 @@ import org.apache.pekko.stream.stage.{ StageLogging } import org.apache.pekko.util.ByteString +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.tor.Socks5ProxyParams import org.bitcoins.core.util.NetworkUtil @@ -121,7 +121,7 @@ class Socks5ProxyGraphStage( proxyParams: Socks5ProxyParams) extends GraphStage[ BidiShape[ByteString, ByteString, ByteString, ByteString]] - with Logging { + with BitcoinSLogger { val bytesIn: Inlet[ByteString] = Inlet("OutgoingTCP.in") val bytesOut: Outlet[ByteString] = Outlet("OutgoingTCP.out") diff --git a/tor/src/main/scala/org/bitcoins/tor/Socks5Connection.scala b/tor/src/main/scala/org/bitcoins/tor/Socks5Connection.scala index da62ad0a2e..197a6b7720 100644 --- a/tor/src/main/scala/org/bitcoins/tor/Socks5Connection.scala +++ b/tor/src/main/scala/org/bitcoins/tor/Socks5Connection.scala @@ -1,12 +1,12 @@ package org.bitcoins.tor -import grizzled.slf4j.Logging import org.apache.pekko.NotUsed import org.apache.pekko.actor.{Actor, ActorLogging, ActorRef, Props, Terminated} import org.apache.pekko.io.Tcp import org.apache.pekko.stream.Materializer import org.apache.pekko.stream.scaladsl.{Flow, Keep, Sink, Source} import org.apache.pekko.util.ByteString +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.tor.Credentials import org.bitcoins.tor.Socks5Connection.Socks5Connect @@ -27,7 +27,7 @@ class Socks5Connection( target: Socks5Connect) extends Actor with ActorLogging - with Logging { + with BitcoinSLogger { import Socks5Connection._ @@ -108,7 +108,7 @@ class Socks5Connection( } -object Socks5Connection extends Logging { +object Socks5Connection extends BitcoinSLogger { def props( tcpConnection: ActorRef, diff --git a/tor/src/main/scala/org/bitcoins/tor/TorCallbacks.scala b/tor/src/main/scala/org/bitcoins/tor/TorCallbacks.scala index f42f4e1eac..5ec605c280 100644 --- a/tor/src/main/scala/org/bitcoins/tor/TorCallbacks.scala +++ b/tor/src/main/scala/org/bitcoins/tor/TorCallbacks.scala @@ -1,6 +1,6 @@ package org.bitcoins.tor -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.callback.{CallbackFactory, ModuleCallbacks} import org.bitcoins.core.api.{Callback, CallbackHandler} @@ -8,7 +8,7 @@ import scala.concurrent.{ExecutionContext, Future} trait OnTorStarted extends Callback[Unit] -trait TorCallbacks extends ModuleCallbacks[TorCallbacks] with Logging { +trait TorCallbacks extends ModuleCallbacks[TorCallbacks] with BitcoinSLogger { def onTorStarted: CallbackHandler[Unit, OnTorStarted] def executeOnTorStarted()(implicit ec: ExecutionContext): Future[Unit] = { diff --git a/tor/src/main/scala/org/bitcoins/tor/TorController.scala b/tor/src/main/scala/org/bitcoins/tor/TorController.scala index e7e687855f..655d4eced4 100644 --- a/tor/src/main/scala/org/bitcoins/tor/TorController.scala +++ b/tor/src/main/scala/org/bitcoins/tor/TorController.scala @@ -2,7 +2,6 @@ package org.bitcoins.tor import org.apache.pekko.Done import org.apache.pekko.util.ByteString -import grizzled.slf4j.Logging import org.apache.pekko.actor.{ Actor, ActorLogging, @@ -13,6 +12,7 @@ import org.apache.pekko.actor.{ Terminated } import org.apache.pekko.io.{IO, Tcp} +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.tor.TorProtocolHandler.Authentication import java.io.IOException @@ -85,7 +85,7 @@ class TorController( } -object TorController extends Logging { +object TorController extends BitcoinSLogger { def props( address: InetSocketAddress, diff --git a/tor/src/main/scala/org/bitcoins/tor/client/TorClient.scala b/tor/src/main/scala/org/bitcoins/tor/client/TorClient.scala index b362c83695..c5421ec411 100644 --- a/tor/src/main/scala/org/bitcoins/tor/client/TorClient.scala +++ b/tor/src/main/scala/org/bitcoins/tor/client/TorClient.scala @@ -1,12 +1,11 @@ package org.bitcoins.tor.client -import grizzled.slf4j.Logging -import org.bitcoins.commons.util.NativeProcessFactory +import org.bitcoins.commons.util.{BitcoinSLogger, NativeProcessFactory} import org.bitcoins.core.api.tor.Socks5ProxyParams import org.bitcoins.core.util.EnvUtil import org.bitcoins.tor.TorProtocolHandler._ import org.bitcoins.tor.config.TorAppConfig -import org.bitcoins.tor.{TorParams} +import org.bitcoins.tor.TorParams import java.io.{File, FileNotFoundException} import java.net.{InetAddress, InetSocketAddress} @@ -19,7 +18,7 @@ class TorClient()(implicit val executionContext: ExecutionContext, conf: TorAppConfig) extends NativeProcessFactory - with Logging { + with BitcoinSLogger { lazy val socks5ProxyParams: Socks5ProxyParams = conf.socks5ProxyParams match { case Some(params) => params @@ -75,7 +74,7 @@ class TorClient()(implicit } -object TorClient extends Logging { +object TorClient extends BitcoinSLogger { // made by doing ./tor --version val TOR_VERSION = "Tor 0.4.7.10 (git-f732a91a73be3ca6)" diff --git a/wallet-test/src/test/scala/org/bitcoins/wallet/UTXOLifeCycleTest.scala b/wallet-test/src/test/scala/org/bitcoins/wallet/UTXOLifeCycleTest.scala index fe9795510f..cb9c1c6dce 100644 --- a/wallet-test/src/test/scala/org/bitcoins/wallet/UTXOLifeCycleTest.scala +++ b/wallet-test/src/test/scala/org/bitcoins/wallet/UTXOLifeCycleTest.scala @@ -1,6 +1,6 @@ package org.bitcoins.wallet -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.wallet.CoinSelectionAlgo import org.bitcoins.core.api.wallet.db.SpendingInfoDb import org.bitcoins.core.currency.{Bitcoins, Satoshis} @@ -25,7 +25,7 @@ import scala.concurrent.Future class UTXOLifeCycleTest extends BitcoinSWalletTestCachedBitcoindNewest - with Logging { + with BitcoinSLogger { behavior of "Wallet Txo States" diff --git a/wallet/src/main/scala/org/bitcoins/wallet/WalletHolder.scala b/wallet/src/main/scala/org/bitcoins/wallet/WalletHolder.scala index 10d45b0d26..59aabd1c6c 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/WalletHolder.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/WalletHolder.scala @@ -1,6 +1,6 @@ package org.bitcoins.wallet -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.chain.ChainQueryApi import org.bitcoins.core.api.dlc.wallet.DLCNeutrinoHDWalletApi import org.bitcoins.core.api.dlc.wallet.db.{ @@ -55,7 +55,7 @@ class WalletNotInitialized extends Exception("The wallet is not initialized") class WalletHolder(initWalletOpt: Option[DLCNeutrinoHDWalletApi])(implicit ec: ExecutionContext) extends DLCNeutrinoHDWalletApi - with Logging { + with BitcoinSLogger { @volatile private var walletOpt: Option[DLCNeutrinoHDWalletApi] = initWalletOpt diff --git a/wallet/src/main/scala/org/bitcoins/wallet/WalletLogger.scala b/wallet/src/main/scala/org/bitcoins/wallet/WalletLogger.scala index 77aee6e08f..0de09bd3cb 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/WalletLogger.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/WalletLogger.scala @@ -1,6 +1,6 @@ package org.bitcoins.wallet -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger /** Exposes access to the wallet logger */ -private[bitcoins] trait WalletLogger extends Logging +private[bitcoins] trait WalletLogger extends BitcoinSLogger diff --git a/wallet/src/main/scala/org/bitcoins/wallet/callback/WalletCallbackStreamManager.scala b/wallet/src/main/scala/org/bitcoins/wallet/callback/WalletCallbackStreamManager.scala index c1ba96291d..df63bf987e 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/callback/WalletCallbackStreamManager.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/callback/WalletCallbackStreamManager.scala @@ -1,6 +1,5 @@ package org.bitcoins.wallet.callback -import grizzled.slf4j.Logging import org.apache.pekko.Done import org.apache.pekko.actor.ActorSystem import org.apache.pekko.stream.OverflowStrategy @@ -10,6 +9,7 @@ import org.apache.pekko.stream.scaladsl.{ Source, SourceQueueWithComplete } +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.CallbackHandler import org.bitcoins.core.api.wallet.db.SpendingInfoDb import org.bitcoins.core.protocol.BitcoinAddress @@ -28,7 +28,7 @@ case class WalletCallbackStreamManager( )(implicit system: ActorSystem) extends WalletCallbacks with StartStopAsync[Unit] - with Logging { + with BitcoinSLogger { import system.dispatcher private val txProcessedQueueSource: Source[ diff --git a/wallet/src/main/scala/org/bitcoins/wallet/callback/WalletCallbacks.scala b/wallet/src/main/scala/org/bitcoins/wallet/callback/WalletCallbacks.scala index 50257edf46..0d0942bc18 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/callback/WalletCallbacks.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/callback/WalletCallbacks.scala @@ -1,6 +1,6 @@ package org.bitcoins.wallet.callback -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.CallbackHandler import org.bitcoins.core.api.callback.{CallbackFactory, ModuleCallbacks} import org.bitcoins.core.api.wallet.db.SpendingInfoDb @@ -15,7 +15,9 @@ import scala.concurrent.{ExecutionContext, Future} * The appropriate callback is executed whenever the wallet finishes, * the corresponding function. */ -trait WalletCallbacks extends ModuleCallbacks[WalletCallbacks] with Logging { +trait WalletCallbacks + extends ModuleCallbacks[WalletCallbacks] + with BitcoinSLogger { def onTransactionProcessed: CallbackHandler[ Transaction, diff --git a/wallet/src/main/scala/org/bitcoins/wallet/sync/WalletSync.scala b/wallet/src/main/scala/org/bitcoins/wallet/sync/WalletSync.scala index 41de06e118..bb02e16ed6 100644 --- a/wallet/src/main/scala/org/bitcoins/wallet/sync/WalletSync.scala +++ b/wallet/src/main/scala/org/bitcoins/wallet/sync/WalletSync.scala @@ -1,6 +1,6 @@ package org.bitcoins.wallet.sync -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.api.wallet.WalletApi import org.bitcoins.core.protocol.blockchain.{Block, BlockHeader} import org.bitcoins.core.util.FutureUtil @@ -8,7 +8,7 @@ import org.bitcoins.crypto.DoubleSha256DigestBE import scala.concurrent.{ExecutionContext, Future} -trait WalletSync extends Logging { +trait WalletSync extends BitcoinSLogger { /** Synchronizes the bitcoin-s' wallet by retrieving each block and then calling * [[Wallet.processBlock()]] on the block retrieved diff --git a/zmq/src/main/scala/org/bitcoins/zmq/ZMQSubscriber.scala b/zmq/src/main/scala/org/bitcoins/zmq/ZMQSubscriber.scala index e02400c218..b5c213bf87 100644 --- a/zmq/src/main/scala/org/bitcoins/zmq/ZMQSubscriber.scala +++ b/zmq/src/main/scala/org/bitcoins/zmq/ZMQSubscriber.scala @@ -1,6 +1,6 @@ package org.bitcoins.zmq -import grizzled.slf4j.Logging +import org.bitcoins.commons.util.BitcoinSLogger import org.bitcoins.core.protocol.blockchain.Block import org.bitcoins.core.protocol.transaction.Transaction import org.bitcoins.core.util.StartStop @@ -27,7 +27,7 @@ class ZMQSubscriber( hashBlockListener: Option[DoubleSha256DigestBE => Unit], rawTxListener: Option[Transaction => Unit], rawBlockListener: Option[Block => Unit]) - extends Logging + extends BitcoinSLogger with StartStop[Unit] { private var isConnected = false diff --git a/zmq/src/test/scala/org/bitcoins/zmq/ZMQSubscriberTest.scala b/zmq/src/test/scala/org/bitcoins/zmq/ZMQSubscriberTest.scala index cb88d7fcd7..26514177df 100644 --- a/zmq/src/test/scala/org/bitcoins/zmq/ZMQSubscriberTest.scala +++ b/zmq/src/test/scala/org/bitcoins/zmq/ZMQSubscriberTest.scala @@ -1,18 +1,18 @@ package org.bitcoins.zmq -import java.net.InetSocketAddress +import org.bitcoins.commons.util.BitcoinSLogger +import java.net.InetSocketAddress import org.bitcoins.core.config.MainNet import org.bitcoins.core.protocol.blockchain.Block import org.bitcoins.core.protocol.transaction.Transaction -import grizzled.slf4j.Logging import org.bitcoins.crypto.DoubleSha256DigestBE import org.scalatest.flatspec.AsyncFlatSpec import org.zeromq.{SocketType, ZFrame, ZMQ, ZMsg} import scala.concurrent.Promise -class ZMQSubscriberTest extends AsyncFlatSpec with Logging { +class ZMQSubscriberTest extends AsyncFlatSpec with BitcoinSLogger { behavior of "ZMQSubscriber"