Address code review comments, thanks @S11001001

digital-asset · Jan 8, 2020 · a6dc267 · a6dc267
1 parent d050b2f
commit a6dc267
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/ledger-service/db-backend/BUILD.bazel b/ledger-service/db-backend/BUILD.bazel
@@ -34,7 +34,6 @@ da_scala_library(
         "@maven//:org_scalaz_scalaz_core_2_12",
         "@maven//:org_tpolecat_doobie_core_2_12",
         "@maven//:org_tpolecat_doobie_free_2_12",
-        "@maven//:org_tpolecat_doobie_postgres_2_12",
         "@maven//:org_typelevel_cats_core_2_12",
         "@maven//:org_typelevel_cats_effect_2_12",
         "@maven//:org_typelevel_cats_free_2_12",

diff --git a/ledger-service/db-backend/src/main/scala/com/digitalasset/http/dbbackend/Queries.scala b/ledger-service/db-backend/src/main/scala/com/digitalasset/http/dbbackend/Queries.scala
@@ -195,10 +195,10 @@ object Queries {
     hd ++ go(0, tl.size)
   }
 
+  @silent // gvs is demonstrably used; try taking it out
   private[http] def selectContracts(party: String, tpid: SurrogateTpId, predicate: Fragment)(
-      implicit log: LogHandler): Query0[DBContract[Unit, JsValue, JsValue, Vector[String]]] = {
-    import doobie.postgres.implicits._
-
+      implicit log: LogHandler,
+      gvs: Get[Vector[String]]): Query0[DBContract[Unit, JsValue, JsValue, Vector[String]]] = {
     val q = sql"""SELECT contract_id, key, payload, signatories, observers, agreement_text
                   FROM contract AS c
                   WHERE (signatories @> ARRAY[$party::text] OR observers @> ARRAY[$party::text])

diff --git a/ledger-service/http-json/src/main/scala/com/digitalasset/http/ContractsFetch.scala b/ledger-service/http-json/src/main/scala/com/digitalasset/http/ContractsFetch.scala
@@ -106,15 +106,15 @@ private class ContractsFetch(
       _ = logger.debug(s"contractsFromOffsetIo($jwt, $party, $templateId, $ob0): $offset1")
     } yield offset1
 
+  @SuppressWarnings(Array("org.wartremover.warts.Any"))
   private def prepareCreatedEventStorage(
-      ce: lav1.event.CreatedEvent): Exception \/ PreInsertContract =
+      ce: lav1.event.CreatedEvent): Exception \/ PreInsertContract = {
+    import scalaz.syntax.traverse._
+    import scalaz.std.option._
     for {
       ac <- domain.ActiveContract fromLedgerApi ce leftMap (de =>
         new IllegalArgumentException(s"contract ${ce.contractId}: ${de.shows}"))
-      lfKey <- ac.key.cata(
-        k => apiValueToLfValue(k) map (Some(_)) leftMap (_.cause),
-        \/-(None)
-      )
+      lfKey <- ac.key.traverse(apiValueToLfValue).leftMap(_.cause)
       lfArg <- apiValueToLfValue(ac.payload) leftMap (_.cause)
     } yield
       DBContract(
@@ -126,6 +126,7 @@ private class ContractsFetch(
         observers = ac.observers,
         agreementText = ac.agreementText
       )
+  }
 
   @SuppressWarnings(Array("org.wartremover.warts.Any"))
   private def jsonifyInsertDeleteStep(

diff --git a/ledger-service/http-json/src/main/scala/com/digitalasset/http/dbbackend/ContractDao.scala b/ledger-service/http-json/src/main/scala/com/digitalasset/http/dbbackend/ContractDao.scala
@@ -71,7 +71,8 @@ object ContractDao {
       party: domain.Party,
       templateId: domain.TemplateId.RequiredPkg,
       predicate: doobie.Fragment)(
-      implicit log: LogHandler): ConnectionIO[Vector[domain.ActiveContract[JsValue]]] =
+      implicit log: LogHandler): ConnectionIO[Vector[domain.ActiveContract[JsValue]]] = {
+    import doobie.postgres.implicits._
     for {
       tpId <- Queries.surrogateTemplateId(
         templateId.packageId,
@@ -81,6 +82,7 @@ object ContractDao {
       dbContracts <- Queries.selectContracts(party.unwrap, tpId, predicate).to[Vector]
       domainContracts = dbContracts.map(toDomain(templateId))
     } yield domainContracts
+  }
 
   private def toDomain(templateId: domain.TemplateId.RequiredPkg)(
       a: Queries.DBContract[Unit, JsValue, JsValue, Vector[String]])