deps(backend): adopt sqlite package

Instead of treating our SQLite bindings as a fork of crawshaw.io/sqlite we now adopt the package directly into our code base. The upstream is abandoned, and we've made modifications to it beyond the point of converging the forks. We'll be making even more changes in the face of new features introduced in Go 1.23, so it make sense to adopt the package now and start ownging it entirely.
seed-hypermedia · Aug 17, 2024 · 0f8a4af · 0f8a4af
1 parent df25171
commit 0f8a4af
Show file tree

Hide file tree

Showing 116 changed files with 149 additions and 272 deletions.
diff --git a/.plzconfig b/.plzconfig
@@ -4,7 +4,6 @@ SelfUpdate = false
 [parse]
 BlacklistDirs = "node_modules"
 BlacklistDirs = "target"
-BlacklistDirs = "third_party"
 BuildDefsDir = "build/rules"
 BuildFileName = "BUILD.plz"
 GitFunctions = true

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -80,7 +80,6 @@
       "-",
       "-plz-out",
       "+backend",
-      "+third_party",
       "+proto",
       "+build"
     ]

diff --git a/backend/BUILD.plz b/backend/BUILD.plz
@@ -5,7 +5,11 @@ subinclude("//build/rules/go:defs", "//build/rules/codegen:defs")
 go_binary(
     name = "seed-daemon",
     srcs = glob(
-        ["**/*.go"],
+        [
+            "**/*.go",
+            "**/*.c",
+            "**/*.h",
+        ],
         exclude = ["**/*_test.go"],
     ) + [
         "//backend/lndhub/lndhubsql:go_library",
@@ -17,9 +21,6 @@ go_binary(
     gomod = "//:gomod",
     package = "./cmd/seed-daemon",
     visibility = ["PUBLIC"],
-    deps = [
-        "//third_party:sqlite",
-    ],
 )
 
 go_binary(
@@ -35,7 +36,11 @@ go_binary(
 go_binary(
     name = "seed-gateway",
     srcs = glob(
-        ["**/*.go"],
+        [
+            "**/*.go",
+            "**/*.c",
+            "**/*.h",
+        ],
         exclude = ["**/*_test.go"],
     ) + [
         "//backend/lndhub/lndhubsql:go_library",
@@ -47,7 +52,4 @@ go_binary(
     gomod = "//:gomod",
     package = "./cmd/seed-gateway",
     visibility = ["PUBLIC"],
-    deps = [
-        "//third_party:sqlite",
-    ],
 )
diff --git a/backend/api/activity/v1alpha/activity.go b/backend/api/activity/v1alpha/activity.go
@@ -5,7 +5,8 @@ import (
 	activity "seed/backend/genproto/activity/v1alpha"
 	"time"
 
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"google.golang.org/grpc"
 )
 

diff --git a/backend/api/apis.go b/backend/api/apis.go
@@ -13,7 +13,8 @@ import (
 	"seed/backend/mttnet"
 	"seed/backend/syncing"
 
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"google.golang.org/grpc"
 )
 

diff --git a/backend/api/documents/v3alpha/documents.go b/backend/api/documents/v3alpha/documents.go
@@ -15,8 +15,9 @@ import (
 	"seed/backend/util/dqb"
 	"seed/backend/util/errutil"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
+
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	cbornode "github.com/ipfs/go-ipld-cbor"

diff --git a/backend/api/entities/v1alpha/entities.go b/backend/api/entities/v1alpha/entities.go
@@ -18,8 +18,9 @@ import (
 	"google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"golang.org/x/exp/slices"
 	"google.golang.org/grpc"
 )

diff --git a/backend/api/groups/v1alpha/db.go.off b/backend/api/groups/v1alpha/db.go.off
@@ -10,8 +10,8 @@ import (
 	"seed/backend/pkg/errutil"
 	"time"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
 	"github.com/ipfs/go-cid"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/backend/api/groups/v1alpha/groups.go.off b/backend/api/groups/v1alpha/groups.go.off
@@ -27,8 +27,8 @@ import (
 	"sync"
 	"time"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/multiformats/go-multiaddr"

diff --git a/backend/api/networking/v1alpha/networking.go b/backend/api/networking/v1alpha/networking.go
@@ -12,8 +12,8 @@ import (
 	"seed/backend/util/dqb"
 	"strings"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
 
 	"github.com/libp2p/go-libp2p/core/peer"
 	"google.golang.org/grpc"

diff --git a/backend/cmd/monitord/Dockerfile b/backend/cmd/monitord/Dockerfile
@@ -2,7 +2,6 @@
 FROM golang:1.23.0-alpine AS builder
 WORKDIR /code
 COPY go.mod go.sum ./
-COPY third_party ./third_party
 RUN go mod download
 COPY backend ./backend
 RUN apk add build-base

diff --git a/backend/cmd/relayd/Dockerfile b/backend/cmd/relayd/Dockerfile
@@ -2,7 +2,6 @@
 FROM golang:1.23.0-alpine AS builder
 WORKDIR /code
 COPY go.mod go.sum ./
-COPY third_party ./third_party
 RUN go mod download
 COPY backend ./backend
 RUN go install ./backend/cmd/relayd/

diff --git a/backend/cmd/seed-daemon/Dockerfile b/backend/cmd/seed-daemon/Dockerfile
@@ -5,7 +5,6 @@ ARG COMMIT_HASH
 ARG BRANCH
 ARG DATE
 COPY go.mod go.sum ./
-COPY third_party ./third_party
 RUN go mod download
 COPY backend ./backend
 COPY monitoring ./monitoring

diff --git a/backend/cmd/seed-site/Dockerfile b/backend/cmd/seed-site/Dockerfile
@@ -5,7 +5,6 @@ ARG COMMIT_HASH
 ARG BRANCH
 ARG DATE
 COPY go.mod go.sum ./
-COPY third_party ./third_party
 RUN go mod download
 COPY backend ./backend
 COPY monitoring ./monitoring

diff --git a/backend/cmd/seed-site/sites/daemon.go.off b/backend/cmd/seed-site/sites/daemon.go.off
@@ -17,7 +17,7 @@ import (
 	"seed/backend/pkg/future"
 	"seed/backend/pkg/libp2px"
 
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite/sqlitex"
 	"github.com/multiformats/go-multiaddr"
 	"google.golang.org/grpc"
 )

diff --git a/backend/cmd/seed-site/sites/sites.go.off b/backend/cmd/seed-site/sites/sites.go.off
@@ -22,8 +22,8 @@ import (
 	rpcpeer "google.golang.org/grpc/peer"
 	"google.golang.org/grpc/status"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/multiformats/go-multiaddr"

diff --git a/backend/daemon/daemon.go b/backend/daemon/daemon.go
@@ -23,7 +23,8 @@ import (
 	"seed/backend/util/future"
 	"seed/backend/wallet"
 
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"github.com/ipfs/boxo/exchange"
 	"github.com/ipfs/boxo/exchange/offline"
 	"go.opentelemetry.io/otel"

diff --git a/backend/daemon/metrics.go b/backend/daemon/metrics.go
@@ -3,7 +3,8 @@ package daemon
 import (
 	"runtime"
 
-	"crawshaw.io/sqlite"
+	"seed/backend/util/sqlite"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promauto"

diff --git a/backend/index/blockstore.go b/backend/index/blockstore.go
@@ -6,8 +6,9 @@ import (
 	"seed/backend/ipfs"
 	"seed/backend/util/dqb"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
+
 	blockstore "github.com/ipfs/boxo/blockstore"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"

diff --git a/backend/index/blockstore_test.go b/backend/index/blockstore_test.go
@@ -8,7 +8,8 @@ import (
 	"seed/backend/util/must"
 	"testing"
 
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite/sqlitex"
+
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	cbornode "github.com/ipfs/go-ipld-cbor"

diff --git a/backend/index/index.go b/backend/index/index.go
@@ -14,8 +14,9 @@ import (
 	"strings"
 	"time"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
+
 	blockstore "github.com/ipfs/boxo/blockstore"
 	"github.com/ipfs/boxo/provider"
 	"github.com/ipfs/go-cid"

diff --git a/backend/index/index_blockstore.go b/backend/index/index_blockstore.go
@@ -4,7 +4,8 @@ import (
 	"context"
 	"seed/backend/ipfs"
 
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite/sqlitex"
+
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	"github.com/multiformats/go-multicodec"

diff --git a/backend/index/index_sql.go b/backend/index/index_sql.go
@@ -7,8 +7,8 @@ import (
 	"seed/backend/util/maybe"
 	"seed/backend/util/sqlitegen"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
 )
 
 // dbStructuralBlobsInsert inserts a structural blob.

diff --git a/backend/index/reindex.go b/backend/index/reindex.go
@@ -7,8 +7,9 @@ import (
 	"slices"
 	"time"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"github.com/ipfs/go-cid"
 	"github.com/multiformats/go-multicodec"
 	"go.uber.org/zap"

diff --git a/backend/lndhub/lndhub.go b/backend/lndhub/lndhub.go
@@ -17,11 +17,11 @@ import (
 	"time"
 	"unicode"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/lightningnetwork/lnd/zpay32"
 	"github.com/mitchellh/mapstructure"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
 )
 
 const (

diff --git a/backend/lndhub/lndhub_test.go b/backend/lndhub/lndhub_test.go
@@ -14,10 +14,10 @@ import (
 	"testing"
 	"time"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/stretchr/testify/require"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
 )
 
 const (

diff --git a/backend/lndhub/lndhubsql/lndhub.go b/backend/lndhub/lndhubsql/lndhub.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"crawshaw.io/sqlite"
+	"seed/backend/util/sqlite"
 )
 
 const (

diff --git a/backend/lndhub/lndhubsql/queries.gen.go b/backend/lndhub/lndhubsql/queries.gen.go
diff --git a/backend/mttnet/connect.go b/backend/mttnet/connect.go
@@ -11,8 +11,8 @@ import (
 
 	"time"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
 
 	"github.com/libp2p/go-libp2p/core/event"
 	"github.com/libp2p/go-libp2p/core/network"

diff --git a/backend/mttnet/last_seen.go b/backend/mttnet/last_seen.go
@@ -4,7 +4,8 @@ import (
 	"math/rand"
 	"time"
 
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"github.com/libp2p/go-libp2p/core/host"
 )
 

diff --git a/backend/mttnet/list_blobs.go b/backend/mttnet/list_blobs.go
@@ -7,8 +7,9 @@ import (
 	p2p "seed/backend/genproto/p2p/v1alpha"
 	"seed/backend/util/dqb"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"github.com/ipfs/go-cid"
 	"go.uber.org/zap"
 )

diff --git a/backend/mttnet/list_peers.go b/backend/mttnet/list_peers.go
@@ -8,8 +8,9 @@ import (
 	"seed/backend/util/dqb"
 	"strings"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"github.com/libp2p/go-libp2p/core/peer"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/backend/mttnet/mttnet.go b/backend/mttnet/mttnet.go
@@ -15,7 +15,8 @@ import (
 	"seed/backend/util/must"
 	"time"
 
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite/sqlitex"
+
 	provider "github.com/ipfs/boxo/provider"
 	"github.com/ipfs/go-datastore"
 	dssync "github.com/ipfs/go-datastore/sync"

diff --git a/backend/mttnet/providing.go b/backend/mttnet/providing.go
@@ -9,8 +9,9 @@ import (
 	"seed/backend/util/dqb"
 	"time"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"github.com/ipfs/boxo/provider"
 	"github.com/ipfs/go-cid"
 	"github.com/multiformats/go-multicodec"

diff --git a/backend/mttnet/syncing.go b/backend/mttnet/syncing.go
@@ -7,8 +7,9 @@ import (
 	"seed/backend/syncing/rbsr"
 	"seed/backend/util/dqb"
 
-	"crawshaw.io/sqlite"
-	"crawshaw.io/sqlite/sqlitex"
+	"seed/backend/util/sqlite"
+	"seed/backend/util/sqlite/sqlitex"
+
 	"github.com/ipfs/go-cid"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"errors"
     	"fmt"
-    	"crawshaw.io/sqlite"
+    	"seed/backend/util/sqlite"
     )
     const (
@@ Expand Down @@