commit a7021471084dbf2d6242517b147bdf94b0754da2 parent 2cc272060b695646dc70b19a87e3efa065ee2669 Author: Antoine A <> Date: Tue, 29 Jul 2025 16:21:50 +0200 common: clean project structure Diffstat:
12 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile @@ -21,8 +21,8 @@ build: .PHONY: install-nobuild-files install-nobuild-files: install -m 644 -D -t $(config_dir) taler-magnet-bank/magnet-bank.conf - install -m 644 -D -t $(sql_dir) database-versioning/versioning.sql - install -m 644 -D -t $(sql_dir) database-versioning/magnet-bank*.sql + install -m 644 -D -t $(sql_dir) common/taler-common/db/versioning.sql + install -m 644 -D -t $(sql_dir) taler-magnet-bank/db/magnet-bank*.sql install -m 644 -D -t $(man_dir)/man1 doc/prebuilt/man/taler-magnet-bank.1 install -m 644 -D -t $(man_dir)/man5 doc/prebuilt/man/taler-magnet-bank.conf.5 diff --git a/README.md b/README.md @@ -11,3 +11,11 @@ the [Taler Wire Gateway API](https://docs.taler.net/core/api-bank-wire.html) and the [Taler Bank Revenue API](https://docs.taler.net/core/api-bank-revenue.html). WIP manual and docs + +## Project structure + +- **taler-magnet-bank**: Magnet Bank adapter. +- **common**: Rust GNU Taler libraries + - **taler-api**: GNU Taler API implementation + - **taler-common**: GNU Taler component logic and types + - **taler-test-utils**: Test utils for GNU Taler adapter written in Rust GNU +\ No newline at end of file diff --git a/database-versioning/taler-api-0001.sql b/common/taler-api/db/taler-api-0001.sql diff --git a/database-versioning/taler-api-drop.sql b/common/taler-api/db/taler-api-drop.sql diff --git a/database-versioning/taler-api-procedures.sql b/common/taler-api/db/taler-api-procedures.sql diff --git a/database-versioning/versioning.sql b/common/taler-api/db/versioning.sql diff --git a/common/taler-api/tests/common/mod.rs b/common/taler-api/tests/common/mod.rs @@ -199,7 +199,7 @@ pub async fn test_api(pool: PgPool, currency: Currency) -> Router { } pub async fn setup() -> (Router, PgPool) { - let pool = db_test_setup_manual("../../database-versioning".as_ref(), "taler-api").await; + let pool = db_test_setup_manual("db".as_ref(), "taler-api").await; let api = test_api(pool.clone(), "EUR".parse().unwrap()).await; (api.finalize(), pool) diff --git a/database-versioning/versioning.sql b/common/taler-common/db/versioning.sql diff --git a/taler-magnet-bank/Cargo.toml b/taler-magnet-bank/Cargo.toml @@ -66,12 +66,12 @@ assets = [ ], # Sql [ - "../database-versioning/versioning.sql", + "../common/taler-common/db/versioning.sql", "/usr/share/taler-magnet-bank/sql/", "644", ], [ - "../database-versioning/magnet-bank*.sql", + "db/magnet-bank*.sql", "/usr/share/taler-magnet-bank/sql/", "644", ], diff --git a/database-versioning/magnet-bank-0001.sql b/taler-magnet-bank/db/magnet-bank-0001.sql diff --git a/database-versioning/magnet-bank-drop.sql b/taler-magnet-bank/db/magnet-bank-drop.sql diff --git a/database-versioning/magnet-bank-procedures.sql b/taler-magnet-bank/db/magnet-bank-procedures.sql