Remove possum storage replace

Fixes #1020.

diff --git a/go.mod b/go.mod
index 8a2c5c1a47a68d9f997638dd4e98fe33ccf5eee5..5ca09539f56ab4a047b5e1c55db94dcc26c65e20 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -19,7 +19,7 @@ require (
        github.com/anacrolix/missinggo v1.3.0
        github.com/anacrolix/missinggo/v2 v2.10.0
        github.com/anacrolix/multiless v0.4.0
        github.com/anacrolix/missinggo v1.3.0
        github.com/anacrolix/missinggo/v2 v2.10.0
        github.com/anacrolix/multiless v0.4.0

-       github.com/anacrolix/possum/go v0.3.2
+       github.com/anacrolix/possum/go v0.4.0

        github.com/anacrolix/squirrel v0.6.4
        github.com/anacrolix/sync v0.5.4
        github.com/anacrolix/tagflag v1.3.0
        github.com/anacrolix/squirrel v0.6.4
        github.com/anacrolix/sync v0.5.4
        github.com/anacrolix/tagflag v1.3.0


@@ -162,5 +162,3 @@ retract (
        // Indefinite outgoing requests on storage write errors. https://github.com/anacrolix/torrent/issues/889
        [v1.29.0, v1.53.2]
 )
        // Indefinite outgoing requests on storage write errors. https://github.com/anacrolix/torrent/issues/889
        [v1.29.0, v1.53.2]
 )

-
-replace github.com/anacrolix/possum/go => ./storage/possum/lib/go

diff --git a/go.sum b/go.sum
index 0c04a109866efbb300215a449f6ff067343cfbcf..3e61826c5345acba1e31872b354c3e953d5eee31 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -114,6 +114,8 @@ github.com/anacrolix/mmsg v1.0.1 h1:TxfpV7kX70m3f/O7ielL/2I3OFkMPjrRCPo7+4X5AWw=
 github.com/anacrolix/mmsg v1.0.1/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc=
 github.com/anacrolix/multiless v0.4.0 h1:lqSszHkliMsZd2hsyrDvHOw4AbYWa+ijQ66LzbjqWjM=
 github.com/anacrolix/multiless v0.4.0/go.mod h1:zJv1JF9AqdZiHwxqPgjuOZDGWER6nyE48WBCi/OOrMM=
 github.com/anacrolix/mmsg v1.0.1/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc=
 github.com/anacrolix/multiless v0.4.0 h1:lqSszHkliMsZd2hsyrDvHOw4AbYWa+ijQ66LzbjqWjM=
 github.com/anacrolix/multiless v0.4.0/go.mod h1:zJv1JF9AqdZiHwxqPgjuOZDGWER6nyE48WBCi/OOrMM=

+github.com/anacrolix/possum/go v0.4.0 h1:72aHo6M2y6Eb5upaBHiaJ1qaiLe4peyeAMS0wDgMybg=
+github.com/anacrolix/possum/go v0.4.0/go.mod h1:LMkSvp9JAi1eKzmrDgJ6iDcWGalpb8Ddnsd9Ovy+ey8=

 github.com/anacrolix/squirrel v0.6.4 h1:K6ABRMCms0xwpEIdY3kAaDBUqiUeUYCKLKI0yHTr9IQ=
 github.com/anacrolix/squirrel v0.6.4/go.mod h1:0kFVjOLMOKVOet6ja2ac1vTOrqVbLj2zy2Fjp7+dkE8=
 github.com/anacrolix/stm v0.2.0/go.mod h1:zoVQRvSiGjGoTmbM0vSLIiaKjWtNPeTvXUSdJQA4hsg=
 github.com/anacrolix/squirrel v0.6.4 h1:K6ABRMCms0xwpEIdY3kAaDBUqiUeUYCKLKI0yHTr9IQ=
 github.com/anacrolix/squirrel v0.6.4/go.mod h1:0kFVjOLMOKVOet6ja2ac1vTOrqVbLj2zy2Fjp7+dkE8=
 github.com/anacrolix/stm v0.2.0/go.mod h1:zoVQRvSiGjGoTmbM0vSLIiaKjWtNPeTvXUSdJQA4hsg=

diff --git a/justfile b/justfile
index 92e52bbdfb5e8ab613e2b9453acaa7cfa3842d9c..205228a09803ae5380e4a347789d2e421894804c 100644 (file)
--- a/justfile
+++ b/justfile
@@ -5,7 +5,7 @@ act:
     act -j test --matrix go-version:'1.24' --env-file .empty.env
 
 test *args: build-possum
     act -j test --matrix go-version:'1.24' --env-file .empty.env
 
 test *args: build-possum

-    go test -race -failfast {{ args }} ./...
+    CGO_LDFLAGS="-L$(realpath storage/possum/lib/target/debug)" go test -race -failfast {{ args }} ./...

 
 build-possum:
     cd storage/possum/lib && cargo build
 
 build-possum:
     cd storage/possum/lib && cargo build