rebase(tests): remove unneeded dependencies, fix rebase

bitcoindevkit · Oct 11, 2024 · e624074 · e624074
1 parent 1bb34e1
commit e624074
Show file tree

Hide file tree

Showing 7 changed files with 278 additions and 726 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,6 +15,4 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter", "serde_json
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-bdk_electrum = { version = "0.19.0"}
-bdk_testenv = { version = "0.10.0" }
-better-panic = "0.3.0"
+anyhow = "1.0.89"
diff --git a/migrations/postgres/01_bdk_wallet.sql b/migrations/postgres/01_bdk_wallet.sql
@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS keychain (
 -- Hash is block hash hex string,
 -- Block height is a u32
 CREATE TABLE IF NOT EXISTS block (
-    wallet_name TEXT,
+    wallet_name TEXT NOT NULL,
     hash TEXT NOT NULL,
     height INTEGER NOT NULL,
     PRIMARY KEY (wallet_name, hash)
@@ -37,7 +37,7 @@ CREATE INDEX idx_block_height ON block (height);
 -- Whole_tx is a consensus encoded transaction,
 -- Last seen is a u64 unix epoch seconds
 CREATE TABLE IF NOT EXISTS tx (
-    wallet_name TEXT,
+    wallet_name TEXT NOT NULL,
     txid TEXT NOT NULL,
     whole_tx BYTEA,
     last_seen BIGINT,
@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS tx (
 -- TxOut value as SATs
 -- TxOut script consensus encoded
 CREATE TABLE IF NOT EXISTS txout (
-    wallet_name TEXT,
+    wallet_name TEXT NOT NULL,
     txid TEXT NOT NULL,
     vout INTEGER NOT NULL,
     value BIGINT NOT NULL,
@@ -62,7 +62,7 @@ CREATE TABLE IF NOT EXISTS txout (
 -- Anchor is a json serialized Anchor structure as JSONB,
 -- Txid is transaction hash hex string (reversed)
 CREATE TABLE IF NOT EXISTS anchor_tx (
-    wallet_name TEXT,
+    wallet_name TEXT NOT NULL,
     block_hash TEXT NOT NULL,
     anchor JSONB NOT NULL,
     txid TEXT NOT NULL,

diff --git a/migrations/sqlite/01_bdk_wallet.sql b/migrations/sqlite/01_bdk_wallet.sql
@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS keychain (
 -- Hash is block hash hex string,
 -- Block height is a u32
 CREATE TABLE IF NOT EXISTS block (
-    wallet_name TEXT,
+    wallet_name TEXT NOT NULL,
     hash TEXT NOT NULL,
     height INTEGER NOT NULL,
     PRIMARY KEY (wallet_name, hash)
@@ -37,7 +37,7 @@ CREATE INDEX idx_block_height ON block (height);
 -- Whole_tx is a consensus encoded transaction,
 -- Last seen is a u64 unix epoch seconds
 CREATE TABLE IF NOT EXISTS tx (
-    wallet_name TEXT,
+    wallet_name TEXT NOT NULL,
     txid TEXT NOT NULL,
     whole_tx BLOB,
     last_seen INTEGER,
@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS tx (
 -- TxOut value as SATs
 -- TxOut script consensus encoded
 CREATE TABLE IF NOT EXISTS txout (
-    wallet_name TEXT,
+    wallet_name TEXT NOT NULL,
     txid TEXT NOT NULL,
     vout INTEGER NOT NULL,
     value INTEGER NOT NULL,
@@ -62,7 +62,7 @@ CREATE TABLE IF NOT EXISTS txout (
 -- Anchor is a json serialized Anchor structure as JSONB,
 -- Txid is transaction hash hex string (reversed)
 CREATE TABLE IF NOT EXISTS anchor_tx (
-    wallet_name TEXT,
+    wallet_name TEXT NOT NULL,
     block_hash TEXT NOT NULL,
     anchor BLOB NOT NULL,
     txid TEXT NOT NULL,