Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cala-types = { path = "cala-ledger-core-types", package = "cala-ledger-core-type
cala-tracing = { path = "cala-tracing", version = "0.15.10-dev" }
cala-ledger = { path = "cala-ledger", version = "0.15.10-dev" }

es-entity = "0.10.36"
es-entity = "0.10.37"
job = { version = "0.6.25", features = ["es-entity"] }
obix = { version = "0.2.27", default-features = false }

Expand Down
32 changes: 17 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
NIX_DEPS_DIR := .nix-deps

.PHONY: start-deps clean-deps setup-db reset-deps reset-deps-perf sqlx-prepare check-code build test-in-ci event-schemas check-event-schemas next-watch rust-example

next-watch:
cargo watch -s 'cargo nextest run'

clean-deps:
./dev/bin/clean-deps.sh

start-deps:
./dev/bin/docker-compose-up.sh integration-deps
@mkdir -p $(NIX_DEPS_DIR)
nix run .#nix-deps-base -- up -D
nix run .#nix-deps-base -- project is-ready --wait

clean-deps:
-nix run .#nix-deps-base -- down
chmod -R u+w $(NIX_DEPS_DIR) 2>/dev/null || true
rm -rf $(NIX_DEPS_DIR)

setup-db:
@echo "Waiting for PostgreSQL and running migrations..."
@for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do \
(cd cala-ledger && cargo sqlx migrate run 2>/dev/null) && echo "Migrations complete" && exit 0; \
echo "Attempt $$i: Database not ready, waiting..."; \
sleep 1; \
done; \
echo "Database failed to become ready after 30 attempts"; \
cd cala-ledger && cargo sqlx migrate run

reset-deps: clean-deps start-deps setup-db
reset-deps-perf: clean-deps start-deps setup-db
nix run .#setup-db-dev

reset-deps: clean-deps start-deps

reset-deps-perf: clean-deps start-deps
psql postgres://user:password@localhost:5432/pg -f ./cala-perf/pg-tools/setup.sql

rust-example:
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ Cala is a robust ledger system developed by Galoy, designed to handle complex fi
source ~/.bashrc
```

#### Docker

- Choose the install method for your system https://docs.docker.com/desktop/

### Testing

Run unit tests with:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 0 additions & 17 deletions dev/bin/clean-deps.sh

This file was deleted.

28 changes: 0 additions & 28 deletions dev/bin/docker-compose-up.sh

This file was deleted.

6 changes: 3 additions & 3 deletions dev/otel-agent-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ receivers:


exporters:
logging:
loglevel: debug
debug:
verbosity: detailed
otlp:
endpoint: "api.honeycomb.io:443"
headers:
Expand All @@ -30,4 +30,4 @@ service:
pipelines:
traces:
receivers: [jaeger, otlp]
exporters: [otlp, logging]
exporters: [otlp, debug]
30 changes: 0 additions & 30 deletions docker-compose.yml

This file was deleted.

16 changes: 16 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading