Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scalafmt-core to 3.7.15 in main #153

Merged
merged 4 commits into from
Nov 7, 2023
Merged

Update scalafmt-core to 3.7.15 in main #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4dce04
Update scalafmt-core to 3.7.15 in main
atala-dev Oct 24, 2023
3e95a58
Reformat with scalafmt 3.7.15
atala-dev Oct 24, 2023
0b88096
Add 'Reformat with scalafmt 3.7.15' to .git-blame-ignore-revs
atala-dev Oct 24, 2023
2ad787a
Merge branch 'main' into update/main/scalafmt-core-3.7.15
FabioPinheiro Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Scala Steward: Reformat with scalafmt 3.7.8
7f0ad6980840682687eb6bc0017014e08ae46421

# Scala Steward: Reformat with scalafmt 3.7.15
3e95a584d68fdb4506caa91a0c7833d277dc8c8d
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.14"
version = "3.7.15"
runner.dialect = scala3

maxColumn = 120
Expand Down
28 changes: 15 additions & 13 deletions mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 =>
Expand Down
2 changes: 0 additions & 2 deletions mediator/src/test/scala/io/iohk/atala/mediator/protocols/ForwardMessageExecutorSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ object ForwardMessageExecutorSpec extends ZIOSpecDefault with DidAccountStubSetu
.provideSomeLayer(AgentStub.agentLayer)
.provideLayerShared(dataAccessLayer) @@ TestAspect.sequential



val dataAccessLayer = EmbeddedMongoDBInstance.layer(port, hostIp)
>>> AsyncDriverResource.layer
>>> ReactiveMongoApi.layer(connectionString)
Expand Down
Loading