Skip to content

Commit 0781caf

Browse files
sputn1cksputn1ck
authored
Merge pull request #585 from sputn1ck/sqlite
Migrate from boltdb to sql
2 parents 0be05a9 + b41752f commit 0781caf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+5144
-223
lines changed

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020

2121
# If you change this value, please change it in the following files as well:
2222
# /Dockerfile
23-
GO_VERSION: 1.19.2
23+
GO_VERSION: 1.20.4
2424

2525
jobs:
2626
########################
@@ -124,3 +124,6 @@ jobs:
124124

125125
- name: run unit tests
126126
run: make unit
127+
128+
- name: run unit test with postgres
129+
run: make unit-postgres

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=${BUILDPLATFORM} golang:1.19.7-alpine as builder
1+
FROM --platform=${BUILDPLATFORM} golang:1.20.4-alpine as builder
22

33
# Copy in the local repository to build from.
44
COPY . /go/src/github.com/lightningnetwork/loop

‎Makefile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ unit:
9595
@$(call print, "Running unit tests.")
9696
$(UNIT)
9797

98+
unit-postgres:
99+
@$(call print, "Running unit tests with postgres.")
100+
$(UNIT) -tags=test_db_postgres
101+
98102
# =========
99103
# UTILITIES
100104
# =========
@@ -122,4 +126,12 @@ mod-check:
122126
$(GOMOD) tidy
123127
if test -n "$$(git status | grep -e "go.mod\|go.sum")"; then echo "Running go mod tidy changes go.mod/go.sum"; git status; git diff; exit 1; fi
124128

129+
sqlc:
130+
@$(call print, "Generating sql models and queries in Go")
131+
./scripts/gen_sqlc_docker.sh
132+
133+
sqlc-check: sqlc
134+
@$(call print, "Verifying sql code generation.")
135+
if test -n "$$(git status --porcelain '*.go')"; then echo "SQL models not properly generated!"; git status --porcelain '*.go'; exit 1; fi
136+
125137

‎client.go‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@ type ClientConfig struct {
121121
}
122122

123123
// NewClient returns a new instance to initiate swaps with.
124-
func NewClient(dbDir string, cfg *ClientConfig) (*Client, func(), error) {
125-
store, err := loopdb.NewBoltSwapStore(dbDir, cfg.Lnd.ChainParams)
126-
if err != nil {
127-
return nil, nil, err
128-
}
124+
func NewClient(dbDir string, loopDB loopdb.SwapStore,
125+
cfg *ClientConfig) (*Client, func(), error) {
126+
129127
lsatStore, err := lsat.NewFileStore(dbDir)
130128
if err != nil {
131129
return nil, nil, err
@@ -139,7 +137,7 @@ func NewClient(dbDir string, cfg *ClientConfig) (*Client, func(), error) {
139137
config := &clientConfig{
140138
LndServices: cfg.Lnd,
141139
Server: swapServerClient,
142-
Store: store,
140+
Store: loopDB,
143141
LsatStore: lsatStore,
144142
CreateExpiryTimer: func(d time.Duration) <-chan time.Time {
145143
return time.NewTimer(d).C
@@ -153,7 +151,7 @@ func NewClient(dbDir string, cfg *ClientConfig) (*Client, func(), error) {
153151

154152
executor := newExecutor(&executorConfig{
155153
lnd: cfg.Lnd,
156-
store: store,
154+
store: loopDB,
157155
sweeper: sweeper,
158156
createExpiryTimer: config.CreateExpiryTimer,
159157
loopOutMaxParts: cfg.LoopOutMaxParts,
@@ -185,20 +183,20 @@ func NewClient(dbDir string, cfg *ClientConfig) (*Client, func(), error) {
185183

186184
cleanup := func() {
187185
swapServerClient.stop()
188-
store.Close()
186+
loopDB.Close()
189187
}
190188

191189
return client, cleanup, nil
192190
}
193191

194192
// FetchSwaps returns all loop in and out swaps currently in the database.
195-
func (s *Client) FetchSwaps() ([]*SwapInfo, error) {
196-
loopOutSwaps, err := s.Store.FetchLoopOutSwaps()
193+
func (s *Client) FetchSwaps(ctx context.Context) ([]*SwapInfo, error) {
194+
loopOutSwaps, err := s.Store.FetchLoopOutSwaps(ctx)
197195
if err != nil {
198196
return nil, err
199197
}
200198

201-
loopInSwaps, err := s.Store.FetchLoopInSwaps()
199+
loopInSwaps, err := s.Store.FetchLoopInSwaps(ctx)
202200
if err != nil {
203201
return nil, err
204202
}
@@ -292,12 +290,12 @@ func (s *Client) Run(ctx context.Context,
292290

293291
// Query store before starting event loop to prevent new swaps from
294292
// being treated as swaps that need to be resumed.
295-
pendingLoopOutSwaps, err := s.Store.FetchLoopOutSwaps()
293+
pendingLoopOutSwaps, err := s.Store.FetchLoopOutSwaps(mainCtx)
296294
if err != nil {
297295
return err
298296
}
299297

300-
pendingLoopInSwaps, err := s.Store.FetchLoopInSwaps()
298+
pendingLoopInSwaps, err := s.Store.FetchLoopInSwaps(mainCtx)
301299
if err != nil {
302300
return err
303301
}

‎go.mod‎

Lines changed: 55 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ require (
1313
github.com/davecgh/go-spew v1.1.1
1414
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1
1515
github.com/fortytw2/leaktest v1.3.0
16+
github.com/golang-migrate/migrate/v4 v4.15.2
1617
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
18+
github.com/jackc/pgconn v1.10.0
19+
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
1720
github.com/jessevdk/go-flags v1.4.0
21+
github.com/lib/pq v1.10.3
1822
github.com/lightninglabs/aperture v0.1.20-beta
1923
github.com/lightninglabs/lndclient v0.16.0-10
2024
github.com/lightninglabs/loop/swapserverrpc v1.0.4
@@ -25,18 +29,23 @@ require (
2529
github.com/lightningnetwork/lnd/queue v1.1.0
2630
github.com/lightningnetwork/lnd/ticker v1.1.0
2731
github.com/lightningnetwork/lnd/tor v1.1.0
32+
github.com/ory/dockertest/v3 v3.10.0
2833
github.com/stretchr/testify v1.8.1
2934
github.com/urfave/cli v1.22.9
30-
golang.org/x/net v0.7.0
31-
google.golang.org/grpc v1.41.0
35+
golang.org/x/net v0.8.0
36+
google.golang.org/grpc v1.45.0
3237
google.golang.org/protobuf v1.27.1
3338
gopkg.in/macaroon-bakery.v2 v2.0.1
3439
gopkg.in/macaroon.v2 v2.1.0
40+
modernc.org/sqlite v1.20.3
3541
)
3642

3743
require (
44+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
45+
github.com/Microsoft/go-winio v0.6.0 // indirect
3846
github.com/NebulousLabs/fastrand v0.0.0-20181203155948-6fb6489aac4e // indirect
3947
github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82 // indirect
48+
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
4049
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
4150
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
4251
github.com/aead/siphash v1.0.1 // indirect
@@ -49,30 +58,40 @@ require (
4958
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
5059
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
5160
github.com/btcsuite/winsvc v1.0.0 // indirect
52-
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
53-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
61+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
62+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
63+
github.com/containerd/continuity v0.3.0 // indirect
5464
github.com/coreos/go-semver v0.3.0 // indirect
5565
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
5666
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
5767
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
5868
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
5969
github.com/decred/dcrd/lru v1.0.0 // indirect
70+
github.com/docker/cli v20.10.17+incompatible // indirect
71+
github.com/docker/docker v20.10.13+incompatible // indirect
72+
github.com/docker/go-connections v0.4.0 // indirect
73+
github.com/docker/go-units v0.4.0 // indirect
6074
github.com/dsnet/compress v0.0.1 // indirect
6175
github.com/dustin/go-humanize v1.0.0 // indirect
6276
github.com/fergusstrange/embedded-postgres v1.10.0 // indirect
6377
github.com/go-errors/errors v1.0.1 // indirect
78+
github.com/go-logr/logr v1.2.2 // indirect
79+
github.com/go-logr/stdr v1.2.2 // indirect
6480
github.com/gogo/protobuf v1.3.2 // indirect
6581
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
6682
github.com/golang/protobuf v1.5.2 // indirect
6783
github.com/golang/snappy v0.0.4 // indirect
6884
github.com/google/btree v1.0.1 // indirect
85+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6986
github.com/google/uuid v1.3.0 // indirect
7087
github.com/gorilla/websocket v1.4.2 // indirect
7188
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
7289
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
7390
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
91+
github.com/hashicorp/errwrap v1.1.0 // indirect
92+
github.com/hashicorp/go-multierror v1.1.1 // indirect
93+
github.com/imdario/mergo v0.3.12 // indirect
7494
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
75-
github.com/jackc/pgconn v1.10.0 // indirect
7695
github.com/jackc/pgio v1.0.0 // indirect
7796
github.com/jackc/pgpassfile v1.0.0 // indirect
7897
github.com/jackc/pgproto3/v2 v2.1.1 // indirect
@@ -83,13 +102,12 @@ require (
83102
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
84103
github.com/jonboulle/clockwork v0.2.2 // indirect
85104
github.com/jrick/logrotate v1.0.0 // indirect
86-
github.com/json-iterator/go v1.1.11 // indirect
105+
github.com/json-iterator/go v1.1.12 // indirect
87106
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
88107
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
89108
github.com/kkdai/bstream v1.0.0 // indirect
90109
github.com/klauspost/compress v1.13.6 // indirect
91110
github.com/klauspost/pgzip v1.2.5 // indirect
92-
github.com/lib/pq v1.10.3 // indirect
93111
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
94112
github.com/lightninglabs/neutrino v0.15.0 // indirect
95113
github.com/lightninglabs/neutrino/cache v1.1.1 // indirect
@@ -99,30 +117,39 @@ require (
99117
github.com/lightningnetwork/lnd/tlv v1.1.0 // indirect
100118
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
101119
github.com/mattn/go-isatty v0.0.16 // indirect
102-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
120+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
103121
github.com/mholt/archiver/v3 v3.5.0 // indirect
104122
github.com/miekg/dns v1.1.43 // indirect
123+
github.com/mitchellh/mapstructure v1.4.1 // indirect
124+
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
105125
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
106-
github.com/modern-go/reflect2 v1.0.1 // indirect
126+
github.com/modern-go/reflect2 v1.0.2 // indirect
107127
github.com/nwaples/rardecode v1.1.2 // indirect
128+
github.com/opencontainers/go-digest v1.0.0 // indirect
129+
github.com/opencontainers/image-spec v1.0.2 // indirect
130+
github.com/opencontainers/runc v1.1.5 // indirect
108131
github.com/pierrec/lz4/v4 v4.1.8 // indirect
132+
github.com/pkg/errors v0.9.1 // indirect
109133
github.com/pmezard/go-difflib v1.0.0 // indirect
110134
github.com/prometheus/client_golang v1.11.1 // indirect
111135
github.com/prometheus/client_model v0.2.0 // indirect
112-
github.com/prometheus/common v0.26.0 // indirect
113-
github.com/prometheus/procfs v0.6.0 // indirect
136+
github.com/prometheus/common v0.30.0 // indirect
137+
github.com/prometheus/procfs v0.7.3 // indirect
114138
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
115139
github.com/rogpeppe/fastuuid v1.2.0 // indirect
116140
github.com/russross/blackfriday/v2 v2.0.1 // indirect
117141
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
118-
github.com/sirupsen/logrus v1.7.0 // indirect
142+
github.com/sirupsen/logrus v1.8.1 // indirect
119143
github.com/soheilhy/cmux v0.1.5 // indirect
120144
github.com/spf13/pflag v1.0.5 // indirect
121145
github.com/stretchr/objx v0.5.0 // indirect
122146
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
123147
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
124148
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect
125149
github.com/ulikunitz/xz v0.5.10 // indirect
150+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
151+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
152+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
126153
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
127154
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
128155
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
@@ -134,26 +161,27 @@ require (
134161
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
135162
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
136163
go.etcd.io/etcd/server/v3 v3.5.7 // indirect
137-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
138-
go.opentelemetry.io/otel v1.0.1 // indirect
139-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
140-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1 // indirect
141-
go.opentelemetry.io/otel/sdk v1.0.1 // indirect
142-
go.opentelemetry.io/otel/trace v1.0.1 // indirect
143-
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
164+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
165+
go.opentelemetry.io/otel v1.3.0 // indirect
166+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0 // indirect
167+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0 // indirect
168+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0 // indirect
169+
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
170+
go.opentelemetry.io/otel/trace v1.3.0 // indirect
171+
go.opentelemetry.io/proto/otlp v0.11.0 // indirect
144172
go.uber.org/atomic v1.7.0 // indirect
145173
go.uber.org/multierr v1.6.0 // indirect
146174
go.uber.org/zap v1.17.0 // indirect
147175
golang.org/x/crypto v0.1.0 // indirect
148176
golang.org/x/exp v0.0.0-20221111094246-ab4555d3164f // indirect
149-
golang.org/x/mod v0.6.0 // indirect
150-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
151-
golang.org/x/sys v0.5.0 // indirect
152-
golang.org/x/term v0.5.0 // indirect
153-
golang.org/x/text v0.7.0 // indirect
154-
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
155-
golang.org/x/tools v0.2.0 // indirect
156-
google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
177+
golang.org/x/mod v0.9.0 // indirect
178+
golang.org/x/sync v0.1.0 // indirect
179+
golang.org/x/sys v0.7.0 // indirect
180+
golang.org/x/term v0.6.0 // indirect
181+
golang.org/x/text v0.8.0 // indirect
182+
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
183+
golang.org/x/tools v0.7.0 // indirect
184+
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
157185
gopkg.in/errgo.v1 v1.0.1 // indirect
158186
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
159187
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -165,7 +193,6 @@ require (
165193
modernc.org/mathutil v1.5.0 // indirect
166194
modernc.org/memory v1.4.0 // indirect
167195
modernc.org/opt v0.1.3 // indirect
168-
modernc.org/sqlite v1.20.3 // indirect
169196
modernc.org/strutil v1.1.3 // indirect
170197
modernc.org/token v1.0.1 // indirect
171198
sigs.k8s.io/yaml v1.2.0 // indirect

0 commit comments

Comments
 (0)