mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2024-11-19 01:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add -Xsource:3 to db-commons/ (#5585)

Browse Source
This commit is contained in:
Chris Stewart 2024-05-11 07:24:00 -05:00 committed by GitHub
parent 863ffd9d6f
commit 791ff3282a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -493,6 +493,7 @@ lazy val chainTest = project
lazy val dbCommons = project lazy val dbCommons = project
.in(file("db-commons")) .in(file("db-commons"))
.settings(scalacOptions += "-Xsource:3")
.settings(CommonSettings.prodSettings: _*) .settings(CommonSettings.prodSettings: _*)
.settings( .settings(
name := "bitcoin-s-db-commons", name := "bitcoin-s-db-commons",
@ -502,6 +503,7 @@ lazy val dbCommons = project
lazy val dbCommonsTest = project lazy val dbCommonsTest = project
.in(file("db-commons-test")) .in(file("db-commons-test"))
.settings(scalacOptions += "-Xsource:3")
.settings(CommonSettings.testSettings: _*) .settings(CommonSettings.testSettings: _*)
.settings( .settings(
name := "bitcoin-s-db-commons-test" name := "bitcoin-s-db-commons-test"

8
db-commons-test/src/test/scala/org/bitcoins/db/models/MasterXPubDAOTest.scala
View File

@ -8,7 +8,7 @@ import java.sql.SQLException
class MasterXPubDAOTest extends TestAppConfigFixture { class MasterXPubDAOTest extends TestAppConfigFixture {
behavior of "MasterXPubDAO" behavior of "MasterXPubDAO"
it must "create and find a master xpub" in { testAppConfig: TestAppConfig => it must "create and find a master xpub" in { (testAppConfig: TestAppConfig) =>
val xpriv = ExtPrivateKey.freshRootKey(ExtKeyVersion.SegWitTestNet3Priv) val xpriv = ExtPrivateKey.freshRootKey(ExtKeyVersion.SegWitTestNet3Priv)
val xpub = xpriv.extPublicKey val xpub = xpriv.extPublicKey
val masterXpub = val masterXpub =
@ -30,7 +30,7 @@ class MasterXPubDAOTest extends TestAppConfigFixture {
} }
} }
it must "create only one master xpub" in { testAppConfig: TestAppConfig => it must "create only one master xpub" in { (testAppConfig: TestAppConfig) =>
val masterXpubDAO = val masterXpubDAO =
MasterXPubDAO()(executionContext, appConfig = testAppConfig) MasterXPubDAO()(executionContext, appConfig = testAppConfig)
@ -52,7 +52,7 @@ class MasterXPubDAOTest extends TestAppConfigFixture {
} }
it must "validate the masterxpub and succeed in the database" in { it must "validate the masterxpub and succeed in the database" in {
testAppConfig: TestAppConfig => (testAppConfig: TestAppConfig) =>
val xpriv = ExtPrivateKey.freshRootKey(ExtKeyVersion.SegWitTestNet3Priv) val xpriv = ExtPrivateKey.freshRootKey(ExtKeyVersion.SegWitTestNet3Priv)
val xpub = xpriv.extPublicKey val xpub = xpriv.extPublicKey
val masterXpub = val masterXpub =
@ -67,7 +67,7 @@ class MasterXPubDAOTest extends TestAppConfigFixture {
} }
it must "throw an exception is the stored master xpub is different than the given" in { it must "throw an exception is the stored master xpub is different than the given" in {
testAppConfig: TestAppConfig => (testAppConfig: TestAppConfig) =>
val xpriv = ExtPrivateKey.freshRootKey(ExtKeyVersion.SegWitTestNet3Priv) val xpriv = ExtPrivateKey.freshRootKey(ExtKeyVersion.SegWitTestNet3Priv)
val xpub = xpriv.extPublicKey val xpub = xpriv.extPublicKey
val masterXpub = val masterXpub =

2
db-commons/src/main/scala/org/bitcoins/db/DbCommonsColumnMappers.scala
View File

@ -185,7 +185,7 @@ class DbCommonsColumnMappers(val profile: JdbcProfile) {
implicit val uint64Mapper: BaseColumnType[UInt64] = { implicit val uint64Mapper: BaseColumnType[UInt64] = {
MappedColumnType.base[UInt64, String]( MappedColumnType.base[UInt64, String](
{ u64: UInt64 => { (u64: UInt64) =>
uInt64ToHex(u64) uInt64ToHex(u64)
}, },
UInt64.fromHex UInt64.fromHex