From 788032071a3b510655aceee23fe92888a3213c45 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 26 Jan 2025 00:20:09 +0000 Subject: [PATCH 1/9] Update sbt-buildinfo to 0.13.1 in main Signed-off-by: Hyperledger Bot --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f610b7852d..7d79a6341d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") From aa30f55eaf3b36353cf2c2fa4374b2e9938c01c6 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 26 Jan 2025 00:20:09 +0000 Subject: [PATCH 2/9] Update sbt-native-packager to 1.11.0 in main Signed-off-by: Hyperledger Bot --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7d79a6341d..f83f972e90 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4") +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.14") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") From 4f07e5a6c355d258200005bdcabf431de471a6a3 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 26 Jan 2025 00:20:10 +0000 Subject: [PATCH 3/9] Update sbt to 1.10.7 in main Signed-off-by: Hyperledger Bot --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 0b699c3052..73df629ac1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.7 From 70ba23643bb2bfb0364dc12aa7bfa52a04992e63 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 26 Jan 2025 00:20:10 +0000 Subject: [PATCH 4/9] Update munit to 1.0.4 in main Signed-off-by: Hyperledger Bot --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 05612d6d67..863866b4cb 100644 --- a/build.sbt +++ b/build.sbt @@ -42,7 +42,7 @@ inThisBuild( ) lazy val V = new { - val munit = "1.0.2" // "0.7.29" + val munit = "1.0.4" // "0.7.29" val munitZio = "0.2.0" // https://mvnrepository.com/artifact/dev.zio/zio From b62896a66048afb7c9b0ea11720ed107d6cba5f9 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 26 Jan 2025 00:20:10 +0000 Subject: [PATCH 5/9] Update sbt-scalafmt to 2.5.4 in main Signed-off-by: Hyperledger Bot --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f83f972e90..9b5b559efd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0") From 2aee94c2b122b844603f428b5c15aa4100fd3b54 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 26 Jan 2025 00:20:11 +0000 Subject: [PATCH 6/9] Update scalafmt-core to 3.8.6 in main Signed-off-by: Hyperledger Bot --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 3639dd959b..bdd51a8f12 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.6 runner.dialect = scala3 maxColumn = 120 From 4672790661915011db56632a31d7395744af6c38 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 26 Jan 2025 00:20:11 +0000 Subject: [PATCH 7/9] Update sbt-coveralls to 1.3.15 in main Signed-off-by: Hyperledger Bot --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9b5b559efd..a1cc72c74a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") -addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.14") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") // In order to import proper version of com.google.protobuf.ByteString we need to add this dependency From 6e7aeb953bcd72aa73a92c5c8fde1a02a44f5742 Mon Sep 17 00:00:00 2001 From: Hyperledger Bot Date: Sun, 26 Jan 2025 00:20:12 +0000 Subject: [PATCH 8/9] Update sbt-scoverage to 2.2.2 in main Signed-off-by: Hyperledger Bot --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index a1cc72c74a..ef34a64af0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") From b710c0b1c3ab1cf8d2c3ee9529460b448758cbc0 Mon Sep 17 00:00:00 2001 From: Yurii Shynbuiev Date: Mon, 3 Mar 2025 20:58:52 +0800 Subject: [PATCH 9/9] style: reformat the code in the scope of scala-fmt upgrade from 3.8.3 to 3.8.6 Signed-off-by: Yurii Shynbuiev --- .../CredentialIssuerServerEndpoints.scala | 5 ++-- .../sql/JdbcDIDNonSecretStorage.scala | 3 ++- .../ConnectionRepositorySpecSuite.scala | 9 +++---- .../service/ConnectionServiceImplSpec.scala | 3 +-- .../identus/mercury/model/Conversions.scala | 3 +-- .../service/CredentialServiceImplSpec.scala | 27 +++++++------------ 6 files changed, 19 insertions(+), 31 deletions(-) diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/oid4vci/CredentialIssuerServerEndpoints.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/oid4vci/CredentialIssuerServerEndpoints.scala index 9a356efb14..bf0d564e3b 100644 --- a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/oid4vci/CredentialIssuerServerEndpoints.scala +++ b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/oid4vci/CredentialIssuerServerEndpoints.scala @@ -147,8 +147,9 @@ case class CredentialIssuerServerEndpoints( } val issuerMetadataServerEndpoint: ZServerEndpoint[Any, Any] = CredentialIssuerEndpoints.issuerMetadataEndpoint - .zServerLogic { - { case (rc, didRef) => credentialIssuerController.getIssuerMetadata(rc, didRef).logTrace(rc) } + .zServerLogic { { case (rc, didRef) => + credentialIssuerController.getIssuerMetadata(rc, didRef).logTrace(rc) + } } val all: List[ZServerEndpoint[Any, Any]] = List( diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDNonSecretStorage.scala b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDNonSecretStorage.scala index 7f86258e80..5177d48e53 100644 --- a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDNonSecretStorage.scala +++ b/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/sql/JdbcDIDNonSecretStorage.scala @@ -282,7 +282,8 @@ class JdbcDIDNonSecretStorage(xa: Transactor[ContextAwareTask], xb: Transactor[T case ManagedDIDKeyMeta.HD(k) => (k.keyUsage, Some(k.keyIndex), k.keyMode, k.curve) case ManagedDIDKeyMeta.Rand(k) => (k.keyUsage, None, k.keyMode, k.curve) } - val cxnIO = (now: Instant) => sql""" + val cxnIO = (now: Instant) => + sql""" | INSERT INTO public.prism_did_key(did, key_id, key_usage, key_index, created_at, operation_hash, key_mode, curve_name) | VALUES | ( diff --git a/connect/core/src/test/scala/org/hyperledger/identus/connect/core/repository/ConnectionRepositorySpecSuite.scala b/connect/core/src/test/scala/org/hyperledger/identus/connect/core/repository/ConnectionRepositorySpecSuite.scala index de0d3742c3..1952e8ee5f 100644 --- a/connect/core/src/test/scala/org/hyperledger/identus/connect/core/repository/ConnectionRepositorySpecSuite.scala +++ b/connect/core/src/test/scala/org/hyperledger/identus/connect/core/repository/ConnectionRepositorySpecSuite.scala @@ -72,8 +72,7 @@ object ConnectionRepositorySpecSuite { } yield { assertTrue(res match case Exit.Failure(cause: Cause.Die) => true - case _ => false - ) + case _ => false) } }, test("getConnectionRecord correctly returns an existing record") { @@ -213,8 +212,7 @@ object ConnectionRepositorySpecSuite { } yield { assertTrue(deleteResult match case Exit.Failure(cause: Cause.Die) => true - case _ => false - ) && + case _ => false) && assertTrue(records.size == 2) && assertTrue(records.contains(aRecord.withWalletId(walletId))) && assertTrue(records.contains(bRecord.withWalletId(walletId))) @@ -296,8 +294,7 @@ object ConnectionRepositorySpecSuite { } yield { assertTrue(updateResult match case Exit.Failure(cause: Cause.Die) => true - case _ => false - ) && + case _ => false) && assertTrue(record.get.protocolState == ProtocolState.InvitationGenerated) && assertTrue(updatedRecord.get.protocolState == ProtocolState.InvitationGenerated) } diff --git a/connect/core/src/test/scala/org/hyperledger/identus/connect/core/service/ConnectionServiceImplSpec.scala b/connect/core/src/test/scala/org/hyperledger/identus/connect/core/service/ConnectionServiceImplSpec.scala index 2f8ad0d3b4..19a8341690 100644 --- a/connect/core/src/test/scala/org/hyperledger/identus/connect/core/service/ConnectionServiceImplSpec.scala +++ b/connect/core/src/test/scala/org/hyperledger/identus/connect/core/service/ConnectionServiceImplSpec.scala @@ -225,8 +225,7 @@ object ConnectionServiceImplSpec extends ZIOSpecDefault { } yield { assertTrue(exit match case Exit.Failure(Cause.Fail(_: InvalidStateForOperation, _)) => true - case _ => false - ) + case _ => false) } } diff --git a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/Conversions.scala b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/Conversions.scala index a12b992791..ef1d96dd4b 100644 --- a/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/Conversions.scala +++ b/mercury/agent-didcommx/src/main/scala/org/hyperledger/identus/mercury/model/Conversions.scala @@ -97,8 +97,7 @@ given Conversion[AttachmentDescriptor, XAttachment] with { new XAttachment.Builder(id, data) .format(attachment.format match case Some(format) => format - case None => null - ) + case None => null) .build() } } diff --git a/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImplSpec.scala b/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImplSpec.scala index 412cbb1d83..64191b887c 100644 --- a/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImplSpec.scala +++ b/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImplSpec.scala @@ -227,8 +227,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS } yield { assertTrue(record match case Exit.Failure(Cause.Die(_: UnmanagedFailureException, _)) => true - case _ => false - ) + case _ => false) } } }, @@ -359,8 +358,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS } yield { assertTrue(exit match case Exit.Failure(Cause.Fail(_: RecordNotFound, _)) => true - case _ => false - ) + case _ => false) } }, test("acceptCredentialOffer should reject unsupported `subjectId` format") { @@ -375,8 +373,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS } yield { assertTrue(record match case Exit.Failure(Cause.Fail(_: UnsupportedDidFormat, _)) => true - case _ => false - ) + case _ => false) } }, test("receiveCredentialRequest successfully updates the record") { @@ -402,8 +399,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS } yield { assertTrue(exit match case Exit.Failure(Cause.Fail(_: RecordNotFoundForThreadIdAndStates, _)) => true - case _ => false - ) + case _ => false) } }, test("receiveCredentialRequest is rejected for an unknown 'thid'") { @@ -416,8 +412,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS } yield { assertTrue(exit match case Exit.Failure(Cause.Fail(_: RecordNotFoundForThreadIdAndStates, _)) => true - case _ => false - ) + case _ => false) } }, test("acceptCredentialRequest successfully updates the record") { @@ -445,8 +440,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS } yield { assertTrue(exit match case Exit.Failure(Cause.Fail(_: RecordNotFound, _)) => true - case _ => false - ) + case _ => false) } }, test("receiveCredentialIssue successfully updates the record") { @@ -480,8 +474,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS } yield { assertTrue(exit match case Exit.Failure(Cause.Fail(_: RecordNotFoundForThreadIdAndStates, _)) => true - case _ => false - ) + case _ => false) } }.provideSomeLayer(holderDidServiceExpectations.toLayer ++ holderManagedDIDServiceExpectations.toLayer), test("receiveCredentialIssue is rejected for an unknown 'thid'") { @@ -498,8 +491,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS } yield { assertTrue(exit match case Exit.Failure(Cause.Fail(_: RecordNotFoundForThreadIdAndStates, _)) => true - case _ => false - ) + case _ => false) } }.provideSomeLayer(holderDidServiceExpectations.toLayer ++ holderManagedDIDServiceExpectations.toLayer), test("Happy flow is successfully executed") { @@ -688,8 +680,7 @@ object CredentialServiceImplSpec extends MockSpecDefault with CredentialServiceS case MyBase64(value) => val ba = new String(Base64.getUrlDecoder.decode(value)) AnoncredCredential(ba).credDefId == credDefId - case _ => false - ) + case _ => false) } } )