Skip to content

Commit 25d1fae

Browse files
author
shotexa
authored
refactor(node): remove legacy BE files (#832)
* Start cleaning up docs Signed-off-by: Shota Jolbordi <[email protected]> * Remove more files Signed-off-by: Shota Jolbordi <[email protected]> * Fix compilation issue Signed-off-by: Shota Jolbordi <[email protected]> * Trim docs Signed-off-by: Shota Jolbordi <[email protected]> * Fix compilation errors Signed-off-by: Shota Jolbordi <[email protected]> * Remove some bitcoin test resources and old docs Signed-off-by: Shota Jolbordi <[email protected]> * Lint Signed-off-by: Shota Jolbordi <[email protected]> * Fix tests Signed-off-by: Shota Jolbordi <[email protected]> --------- Signed-off-by: Shota Jolbordi <[email protected]>
1 parent 4961d10 commit 25d1fae

File tree

362 files changed

+585
-13624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

362 files changed

+585
-13624
lines changed

build.sbt

Lines changed: 84 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ lazy val versions = new {
5050
val typesafeConfig = "1.4.2"
5151
val fs2 = "3.2.5"
5252
val scalaUri = "4.0.0"
53-
val prismSdk = "v1.4.1-snapshot-1688975371-7541fd2" // deployed to github packages from sdk branch "node-1.4-extension-sdk"
53+
val prismSdk =
54+
"v1.4.1-snapshot-1688975371-7541fd2" // deployed to github packages from sdk branch "node-1.4-extension-sdk"
5455
val vaultSdk = "0.1.0-build-2-96cc137d"
5556
}
5657

@@ -108,9 +109,9 @@ lazy val Dependencies = new {
108109
// We have to exclude bouncycastle since for some reason bitcoinj depends on bouncycastle jdk15to18
109110
// (i.e. JDK 1.5 to 1.8), but we are using JDK 11
110111
val prismCredentials =
111-
"io.iohk.atala" % "prism-credentials-jvm" % versions.prismSdk excludeAll ExclusionRule(
112-
organization = "org.bouncycastle"
113-
)
112+
"io.iohk.atala" % "prism-credentials-jvm" % versions.prismSdk excludeAll ExclusionRule(
113+
organization = "org.bouncycastle"
114+
)
114115
val prismProtos =
115116
"io.iohk.atala" % "prism-protos-jvm" % versions.prismSdk % "protobuf-src" intransitive ()
116117
val vaultProtos =
@@ -190,7 +191,7 @@ lazy val commonSettings = Seq(
190191
"-Ywarn-dead-code"
191192
)
192193
)
193-
),
194+
),
194195
scalacOptions += "-Ymacro-annotations",
195196
javacOptions ++= Seq("-source", "1.11", "-target", "1.11"),
196197
githubTokenSource := TokenSource.Environment("GITHUB_TOKEN"),
@@ -243,43 +244,43 @@ lazy val commonSettings = Seq(
243244
}
244245
)
245246

246-
lazy val common = project
247-
.in(file("common"))
248-
.settings(
249-
commonSettings,
250-
// Make ScalaPB compile protos relative to `protobuf_external_src/protos` directory.
251-
// Otherwise, it will assume that `protobuf_external_src` is the root directory for proto files.
252-
Compile / PB.protoSources := (Compile / PB.protoSources).value.map {
253-
case externalSrc if externalSrc.toPath.endsWith("protobuf_external_src") =>
254-
externalSrc / "proto"
255-
case other => other
256-
},
257-
resolvers += Resolver.mavenLocal,
258-
resolvers += Resolver.jcenterRepo,
259-
resolvers += Resolver.mavenCentral,
260-
libraryDependencies ++=
261-
Dependencies.doobieDependencies ++
262-
Dependencies.dockerDependencies ++
263-
Dependencies.bouncyDependencies ++
264-
Dependencies.grpcDependencies ++
265-
Dependencies.mockitoDependencies ++
266-
Dependencies.kamonDependencies ++
267-
Dependencies.circeDependencies ++
268-
Dependencies.enumeratumDependencies ++
269-
Dependencies.tofuDependencies ++
270-
Seq(
271-
Dependencies.diffx,
272-
Dependencies.flyway,
273-
Dependencies.typesafeConfig,
274-
Dependencies.fs2,
275-
Dependencies.scalaUri
276-
) ++
277-
Dependencies.prismDependencies ++
278-
Dependencies.scalapbDependencies,
279-
Compile / PB.targets := Seq(
280-
scalapb.gen() -> (Compile / sourceManaged).value / "proto"
281-
)
282-
)
247+
//lazy val common = project
248+
// .in(file("common"))
249+
// .settings(
250+
// commonSettings,
251+
// // Make ScalaPB compile protos relative to `protobuf_external_src/protos` directory.
252+
// // Otherwise, it will assume that `protobuf_external_src` is the root directory for proto files.
253+
// Compile / PB.protoSources := (Compile / PB.protoSources).value.map {
254+
// case externalSrc if externalSrc.toPath.endsWith("protobuf_external_src") =>
255+
// externalSrc / "proto"
256+
// case other => other
257+
// },
258+
// resolvers += Resolver.mavenLocal,
259+
// resolvers += Resolver.jcenterRepo,
260+
// resolvers += Resolver.mavenCentral,
261+
// libraryDependencies ++=
262+
// Dependencies.doobieDependencies ++
263+
// Dependencies.dockerDependencies ++
264+
// Dependencies.bouncyDependencies ++
265+
// Dependencies.grpcDependencies ++
266+
// Dependencies.mockitoDependencies ++
267+
// Dependencies.kamonDependencies ++
268+
// Dependencies.circeDependencies ++
269+
// Dependencies.enumeratumDependencies ++
270+
// Dependencies.tofuDependencies ++
271+
// Seq(
272+
// Dependencies.diffx,
273+
// Dependencies.flyway,
274+
// Dependencies.typesafeConfig,
275+
// Dependencies.fs2,
276+
// Dependencies.scalaUri
277+
// ) ++
278+
// Dependencies.prismDependencies ++
279+
// Dependencies.scalapbDependencies,
280+
// Compile / PB.targets := Seq(
281+
// scalapb.gen() -> (Compile / sourceManaged).value / "proto"
282+
// )
283+
// )
283284

284285
lazy val node =
285286
project
@@ -288,32 +289,58 @@ lazy val node =
288289
commonSettings,
289290
name := "node",
290291
Compile / mainClass := Some("io.iohk.atala.prism.node.NodeApp"),
292+
// Make ScalaPB compile protos relative to `protobuf_external_src/protos` directory.
293+
// Otherwise, it will assume that `protobuf_external_src` is the root directory for proto files.
294+
Compile / PB.protoSources := (Compile / PB.protoSources).value.map {
295+
case externalSrc if externalSrc.toPath.endsWith("protobuf_external_src") =>
296+
externalSrc / "proto"
297+
case other => other
298+
},
299+
Compile / PB.targets := Seq(
300+
scalapb.gen() -> (Compile / sourceManaged).value / "proto"
301+
),
302+
resolvers += Resolver.mavenLocal,
303+
resolvers += Resolver.jcenterRepo,
304+
resolvers += Resolver.mavenCentral,
291305
Docker / maintainer := "[email protected]",
292306
Docker / dockerUsername := Some("input-output-hk"),
293307
Docker / dockerRepository := Some("ghcr.io"),
294308
Docker / packageName := "prism-node",
295309
dockerExposedPorts := Seq(5432),
296310
dockerBaseImage := "openjdk:11",
297-
libraryDependencies ++= Dependencies.circeDependencies ++ Dependencies.enumeratumDependencies ++ Dependencies.doobieDependencies ++
298-
Dependencies.grpcDependencies ++ Dependencies.logbackDependencies ++
299-
Dependencies.sttpDependencies ++
300-
Dependencies.prismDependencies ++
301-
Dependencies.mockitoDependencies ++
302-
Seq(
303-
Dependencies.chimney,
304-
Dependencies.flyway,
305-
Dependencies.postgresql,
306-
Dependencies.scalapbRuntimeGrpc,
307-
Dependencies.slf4j,
308-
Dependencies.typesafeConfig
309-
)
311+
libraryDependencies
312+
++= Dependencies.circeDependencies
313+
++ Dependencies.tofuDependencies
314+
++ Dependencies.kamonDependencies
315+
++ Dependencies.dockerDependencies
316+
++ Dependencies.bouncyDependencies
317+
++ Dependencies.enumeratumDependencies
318+
++ Dependencies.doobieDependencies
319+
++ Dependencies.grpcDependencies
320+
++ Dependencies.logbackDependencies
321+
++ Dependencies.sttpDependencies
322+
++ Dependencies.prismDependencies
323+
++ Dependencies.mockitoDependencies
324+
++ Dependencies.prismDependencies
325+
++ Dependencies.scalapbDependencies
326+
++ Seq(
327+
Dependencies.chimney,
328+
Dependencies.diffx,
329+
Dependencies.flyway,
330+
Dependencies.typesafeConfig,
331+
Dependencies.postgresql,
332+
Dependencies.scalapbRuntimeGrpc,
333+
Dependencies.slf4j,
334+
Dependencies.typesafeConfig,
335+
Dependencies.fs2,
336+
Dependencies.scalaUri
337+
)
310338
)
311339
.enablePlugins(BuildInfoPlugin, JavaAppPackaging, DockerPlugin)
312-
.dependsOn(common % "compile->compile;test->test")
313340

314341
lazy val root = project
315342
.in(file("."))
316-
.aggregate(common, node)
343+
.aggregate(node)
317344

318345
Global / onChangedBuildSource := ReloadOnSourceChanges
319346

common/src/main/protobuf/endorsements_api.proto

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)