diff --git a/.scalafmt.conf b/.scalafmt.conf new file mode 100644 index 0000000..6053b81 --- /dev/null +++ b/.scalafmt.conf @@ -0,0 +1,25 @@ +version = 2.7.5 +style = intellij +maxColumn = 110 +lineEndings = preserve +align = most +align.openParenCallSite = false +align.openParenDefnSite = true +align.tokens = [ + {code = "<-"}, + {code = "=>", owner = "Case"}, + {code = "%", owner = "Term.ApplyInfix"}, + {code = "%%", owner = "Term.ApplyInfix"} +] +continuationIndent.defnSite = 2 +continuationIndent.extendSite = 4 +rewrite.rules = [RedundantBraces, RedundantParens, SortImports, SortModifiers, PreferCurlyFors] +rewrite.sortModifiers.order = ["override", "private", "protected", "implicit", "final", "sealed", "abstract", "lazy"] +newlines.sometimesBeforeColonInMethodReturnType = false +spaces.inImportCurlyBraces = true +danglingParentheses = true +includeCurlyBraceInSelectChains = false +assumeStandardLibraryStripMargin = true +docstrings.style = "Asterisk" + +optIn.configStyleArguments = true \ No newline at end of file diff --git a/src/main/scala/iog/psg/cardano/CardanoApi.scala b/src/main/scala/iog/psg/cardano/CardanoApi.scala index 4c521f9..82de7e9 100644 --- a/src/main/scala/iog/psg/cardano/CardanoApi.scala +++ b/src/main/scala/iog/psg/cardano/CardanoApi.scala @@ -317,7 +317,10 @@ trait CardanoApi { * @param addresses recipient addresses * @return migrate shelley wallet request */ - def migrateShelleyWallet(walletId: String, passphrase: String, addresses: Seq[String]): Future[CardanoApiRequest[Seq[SubmitMigrationResponse]]] + def migrateShelleyWallet(walletId: String, + passphrase: String, + addresses: Seq[String] + ): Future[CardanoApiRequest[Seq[SubmitMigrationResponse]]] /** * Calculate the exact cost of sending all funds from particular Shelley wallet to a set of addresses diff --git a/src/main/scala/iog/psg/cardano/CardanoApiImpl.scala b/src/main/scala/iog/psg/cardano/CardanoApiImpl.scala index ad6ef20..e9bd580 100644 --- a/src/main/scala/iog/psg/cardano/CardanoApiImpl.scala +++ b/src/main/scala/iog/psg/cardano/CardanoApiImpl.scala @@ -1,15 +1,12 @@ package iog.psg.cardano -import java.io.File import java.time.ZonedDateTime -import java.util.Scanner import akka.actor.ActorSystem import akka.http.scaladsl.marshalling.Marshal import akka.http.scaladsl.model.HttpMethods._ import akka.http.scaladsl.model.Uri.Query import akka.http.scaladsl.model._ -import akka.util.ByteString import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._ import io.circe.generic.auto._ import io.circe.generic.extras.Configuration @@ -100,7 +97,7 @@ private class CardanoApiImpl(baseUriWithPort: String)(implicit ec: ExecutionCont /** * @inheritdoc */ - override def networkParameters(): CardanoApiRequest[NetworkParameters] = { + override def networkParameters(): CardanoApiRequest[NetworkParameters] = CardanoApiRequest( HttpRequest( uri = s"${network}/parameters", @@ -108,17 +105,15 @@ private class CardanoApiImpl(baseUriWithPort: String)(implicit ec: ExecutionCont ), _.toNetworkParametersResponse ) - } /** * @inheritdoc */ - override def createRestoreWallet( - name: String, - passphrase: String, - mnemonicSentence: MnemonicSentence, - mnemonicSecondFactor: Option[MnemonicSentence] = None, - addressPoolGap: Option[Int] = None + override def createRestoreWallet(name: String, + passphrase: String, + mnemonicSentence: MnemonicSentence, + mnemonicSecondFactor: Option[MnemonicSentence] = None, + addressPoolGap: Option[Int] = None ): Future[CardanoApiRequest[Wallet]] = { val createRestore = @@ -311,8 +306,9 @@ private class CardanoApiImpl(baseUriWithPort: String)(implicit ec: ExecutionCont * @inheritdoc */ override def updatePassphrase(walletId: String, - oldPassphrase: String, - newPassphrase: String): Future[CardanoApiRequest[Unit]] = { + oldPassphrase: String, + newPassphrase: String + ): Future[CardanoApiRequest[Unit]] = { val uri = Uri(s"$wallets/${walletId}/passphrase") val updater = UpdatePassphrase(oldPassphrase, newPassphrase) @@ -355,7 +351,7 @@ private class CardanoApiImpl(baseUriWithPort: String)(implicit ec: ExecutionCont CardanoApiRequest( HttpRequest( uri = uri, - method = GET, + method = GET ), _.toUTxOStatisticsResponse ) @@ -379,9 +375,12 @@ private class CardanoApiImpl(baseUriWithPort: String)(implicit ec: ExecutionCont /** * @inheritdoc */ - override def migrateShelleyWallet(walletId: String, passphrase: String, addresses: Seq[String]): Future[CardanoApiRequest[Seq[SubmitMigrationResponse]]] = { + override def migrateShelleyWallet(walletId: String, + passphrase: String, + addresses: Seq[String] + ): Future[CardanoApiRequest[Seq[SubmitMigrationResponse]]] = { val updater = SubmitMigration(passphrase = passphrase, addresses = addresses) - Marshal(updater).to[RequestEntity] map { marshalled => { + Marshal(updater).to[RequestEntity] map { marshalled => CardanoApiRequest( HttpRequest( uri = generateMigrationsUrl(walletId), @@ -390,7 +389,7 @@ private class CardanoApiImpl(baseUriWithPort: String)(implicit ec: ExecutionCont ), _.toSubmitMigrationResponse ) - }} + } } /**