From b2090c952e9e7489387a24b036279aceb242ac61 Mon Sep 17 00:00:00 2001 From: atala-dev <57987237+atala-dev@users.noreply.github.com> Date: Tue, 7 Nov 2023 15:01:18 +0000 Subject: [PATCH] Update scalafmt-core to 3.7.15 in main (#153) * Update scalafmt-core to 3.7.15 in main * Reformat with scalafmt 3.7.15 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.7.15' to .git-blame-ignore-revs --------- Signed-off-by: Fabio Pinheiro Co-authored-by: Fabio Pinheiro Signed-off-by: atala-dev <57987237+atala-dev@users.noreply.github.com> Signed-off-by: Shailesh Patil --- .git-blame-ignore-revs | 3 ++ .scalafmt.conf | 2 +- .../mediator/protocols/PickupExecuter.scala | 28 ++++++++++--------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 86b9c5ce..13dccddd 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.7.8 7f0ad6980840682687eb6bc0017014e08ae46421 + +# Scala Steward: Reformat with scalafmt 3.7.15 +3e95a584d68fdb4506caa91a0c7833d277dc8c8d diff --git a/.scalafmt.conf b/.scalafmt.conf index 91dcc5d3..3f4c1329 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.14" +version = "3.7.15" runner.dialect = scala3 maxColumn = 120 diff --git a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala index 6f560cee..38eb77bc 100644 --- a/mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala +++ b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala @@ -114,18 +114,20 @@ object PickupExecuter case Some(didAccount) => val msgHash = didAccount.messagesRef.filter(_.state == false).map(_.hash) if (msgHash.isEmpty) { - ZIO.succeed(Status( - thid = m.id, - from = m.to.asFROM, - to = m.from.asTO, - recipient_did = m.recipient_did, - message_count = msgHash.size, - longest_waited_seconds = None, // TODO - newest_received_time = None, // TODO - oldest_received_time = None, // TODO - total_bytes = None, // TODO - live_delivery = None, // TODO - ).toPlaintextMessage) + ZIO.succeed( + Status( + thid = m.id, + from = m.to.asFROM, + to = m.from.asTO, + recipient_did = m.recipient_did, + message_count = msgHash.size, + longest_waited_seconds = None, // TODO + newest_received_time = None, // TODO + oldest_received_time = None, // TODO + total_bytes = None, // TODO + live_delivery = None, // TODO + ).toPlaintextMessage + ) } else { for { allMessagesFor <- repoMessageItem.findByIds(msgHash) @@ -145,7 +147,7 @@ object PickupExecuter recipient_did = m.recipient_did, attachments = messagesToReturn.map(m => (m._id, m.msg)).toMap, ).toPlaintextMessage - } + } } yield SyncReplyOnly(ret) case m: MessageDelivery =>