mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-22 06:31:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Create migration to drop confirmations column from txo_spending_info … (#1099)

Browse source 
* Create migration to drop confirmations column from txo_spending_info table in the wallet database, also fix a long standing issue in BitcoinSFixture where failure cases in the testing suite were not being handled properly

* Fix scala 2.11.12 compile issue
This commit is contained in:
Chris Stewart 2020-02-07 07:45:15 -06:00 • committed by GitHub
parent 64a417a091
commit 5f938efb8a
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
db-commons/src/main/scala/org/bitcoins/db/DbManagement.scala
View file

@ -102,7 +102,8 @@ abstract class DbManagement extends DatabaseLogger {
try {
flyway.migrate()
} catch {
case _: FlywayException =>
case err: FlywayException =>
logger(appConfig).warn(s"Failed to apply first round of migrations, attempting baseline and re-apply",err)
//maybe we have an existing database, so attempt to baseline the existing
//database and then apply migrations again
flyway.baseline()

7
testkit/src/main/scala/org/bitcoins/testkit/fixtures/BitcoinSFixture.scala
View file

@ -27,13 +27,10 @@ trait BitcoinSFixture extends BitcoinSAsyncFixtureTest {
destroy: T => Future[Any])(test: OneArgAsyncTest): FutureOutcome = {
val fixtureF = build()
fixtureF.failed.foreach { err =>
println(s"Failed to build fixture with err=${err}")
throw err
}
val outcomeF: Future[Outcome] = fixtureF.flatMap { fixture =>
test(fixture.asInstanceOf[FixtureParam]).toFuture
}.recoverWith { case err =>
FutureOutcome.failed(err).toFuture
}
val futOutcome: FutureOutcome = new FutureOutcome(outcomeF)

8
wallet/src/main/resources/walletdb/migration/V3__txo_spending_info_drop_confirmations.sql Normal file
View file

@ -0,0 +1,8 @@
-- This block drops the "confirmations" column
CREATE TEMPORARY TABLE "txo_spending_info_backup" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"tx_outpoint" VARCHAR(254) NOT NULL, "script_pub_key" VARCHAR(254) NOT NULL,"value" INTEGER NOT NULL,"hd_privkey_path" VARCHAR(254) NOT NULL,"redeem_script" VARCHAR(254),"script_witness" VARCHAR(254),"confirmations" INTEGER,"txid" VARCHAR(254) NOT NULL,"block_hash" VARCHAR(254), "txo_state" VARCHAR(254) NOT NULL, constraint "fk_scriptPubKey" foreign key("script_pub_key") references "addresses"("script_pub_key"));
INSERT INTO "txo_spending_info_backup" SELECT "id", "tx_outpoint", "script_pub_key", "value", "hd_privkey_path", "redeem_script", "script_witness", "confirmations", "txid","block_hash", "txo_state" FROM "txo_spending_info";
DROP TABLE "txo_spending_info";
CREATE TABLE "txo_spending_info" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,"tx_outpoint" VARCHAR(254) NOT NULL, "script_pub_key" VARCHAR(254) NOT NULL,"value" INTEGER NOT NULL,"hd_privkey_path" VARCHAR(254) NOT NULL,"redeem_script" VARCHAR(254),"script_witness" VARCHAR(254),"txid" VARCHAR(254) NOT NULL,"block_hash" VARCHAR(254), "txo_state" VARCHAR(254) NOT NULL, constraint "fk_scriptPubKey" foreign key("script_pub_key") references "addresses"("script_pub_key") on update NO ACTION on delete NO ACTION);
INSERT INTO "txo_spending_info" SELECT "id", "tx_outpoint", "script_pub_key", "value", "hd_privkey_path", "redeem_script", "script_witness", "txid", "block_hash", "txo_state" FROM "txo_spending_info_backup";
DROP TABLE "txo_spending_info_backup";