From 5c0247e366e22b15a1abfc10411efabae7f7aba9 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 8 Nov 2024 11:46:34 +0000 Subject: [PATCH 1/3] fix: blob/allocate response for already allocated or received blob --- pkg/service/storage/ucan_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/service/storage/ucan_test.go b/pkg/service/storage/ucan_test.go index 134384a..1226c30 100644 --- a/pkg/service/storage/ucan_test.go +++ b/pkg/service/storage/ucan_test.go @@ -6,7 +6,6 @@ import ( "fmt" "math/rand/v2" "testing" - "time" "github.com/ipld/go-ipld-prime" "github.com/multiformats/go-multihash" @@ -272,7 +271,6 @@ func TestServer(t *testing.T) { data := testutil.RandomBytes(int(size)) digest := testutil.Must(multihash.Sum(data, multihash.SHA2_256, -1))(t) cause := testutil.RandomCID() - exp := uint64(time.Now().Add(time.Second * 30).Unix()) allocNb := blob.AllocateCaveats{ Space: space, @@ -303,7 +301,6 @@ func TestServer(t *testing.T) { Digest: digest, Size: size, }, - Expires: exp, Put: blob.Promise{ UcanAwait: blob.Result{ Selector: ".out.ok", From 8165e87b9029033e21273eb8d1add5240c03fad0 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 30 Oct 2024 16:19:57 +0000 Subject: [PATCH 2/3] feat: integrate updated blob/accept capability --- go.mod | 2 +- go.sum | 2 ++ pkg/service/storage/ucan_test.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index c4b2866..ceb7903 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/multiformats/go-multiaddr v0.13.0 github.com/multiformats/go-multibase v0.2.0 github.com/multiformats/go-multihash v0.2.3 - github.com/storacha/go-capabilities v0.0.0-20241021134022-7144600f5aeb + github.com/storacha/go-capabilities v0.0.0-20241030160329-4cf19ffc732d github.com/storacha/go-metadata v0.0.0-20241021141939-f94d93dcda78 github.com/storacha/go-ucanto v0.1.1-0.20241028163940-34de8cd912bb github.com/storacha/ipni-publisher v0.0.0-20241029210117-3286a26a47a8 diff --git a/go.sum b/go.sum index 3bfd59d..a142512 100644 --- a/go.sum +++ b/go.sum @@ -538,6 +538,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/storacha/go-capabilities v0.0.0-20241021134022-7144600f5aeb h1:A9/44D9FChNmC0Kp+QIZ9k+a+ng2Qsym3TumTrEZPXM= github.com/storacha/go-capabilities v0.0.0-20241021134022-7144600f5aeb/go.mod h1:1x2qMcvOUvF6prSiWXsEeEfV3OcX/L2fk6iNgPMNfZU= +github.com/storacha/go-capabilities v0.0.0-20241030160329-4cf19ffc732d h1:zcRQSf/3GY/R/wC1W0DKxTGUacsZuwIwhGZH63XWMDE= +github.com/storacha/go-capabilities v0.0.0-20241030160329-4cf19ffc732d/go.mod h1:vHqUkLGC11Fhio/2qBJkK8MmA4q1t7DaRVdTIo0UHhE= github.com/storacha/go-metadata v0.0.0-20241021141939-f94d93dcda78 h1:NAti9hMLMo8F0Iyz5ldS41CY6MyukRH0OrTPV4u2340= github.com/storacha/go-metadata v0.0.0-20241021141939-f94d93dcda78/go.mod h1:DcwwQnyFuTk531cKD9sUkQg/gzpwKaIqH9I7oZYyeRc= github.com/storacha/go-ucanto v0.1.1-0.20241028163940-34de8cd912bb h1:lFwFtMjgt162ot9pnu230haLjRQ1rqwJOIAyywOqAX8= diff --git a/pkg/service/storage/ucan_test.go b/pkg/service/storage/ucan_test.go index 1226c30..b9cbb1a 100644 --- a/pkg/service/storage/ucan_test.go +++ b/pkg/service/storage/ucan_test.go @@ -302,7 +302,7 @@ func TestServer(t *testing.T) { Size: size, }, Put: blob.Promise{ - UcanAwait: blob.Result{ + UcanAwait: blob.Await{ Selector: ".out.ok", Link: testutil.RandomCID(), }, From 822c092dab53a91e0771eb1114e49ee3c85a9b7c Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 8 Nov 2024 11:50:52 +0000 Subject: [PATCH 3/3] chore: use correct commit --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index ceb7903..a6f1a7d 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/multiformats/go-multiaddr v0.13.0 github.com/multiformats/go-multibase v0.2.0 github.com/multiformats/go-multihash v0.2.3 - github.com/storacha/go-capabilities v0.0.0-20241030160329-4cf19ffc732d + github.com/storacha/go-capabilities v0.0.0-20241108115011-2ffd682f2397 github.com/storacha/go-metadata v0.0.0-20241021141939-f94d93dcda78 github.com/storacha/go-ucanto v0.1.1-0.20241028163940-34de8cd912bb github.com/storacha/ipni-publisher v0.0.0-20241029210117-3286a26a47a8 diff --git a/go.sum b/go.sum index a142512..b1e3515 100644 --- a/go.sum +++ b/go.sum @@ -536,10 +536,8 @@ github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t6 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/storacha/go-capabilities v0.0.0-20241021134022-7144600f5aeb h1:A9/44D9FChNmC0Kp+QIZ9k+a+ng2Qsym3TumTrEZPXM= -github.com/storacha/go-capabilities v0.0.0-20241021134022-7144600f5aeb/go.mod h1:1x2qMcvOUvF6prSiWXsEeEfV3OcX/L2fk6iNgPMNfZU= -github.com/storacha/go-capabilities v0.0.0-20241030160329-4cf19ffc732d h1:zcRQSf/3GY/R/wC1W0DKxTGUacsZuwIwhGZH63XWMDE= -github.com/storacha/go-capabilities v0.0.0-20241030160329-4cf19ffc732d/go.mod h1:vHqUkLGC11Fhio/2qBJkK8MmA4q1t7DaRVdTIo0UHhE= +github.com/storacha/go-capabilities v0.0.0-20241108115011-2ffd682f2397 h1:uLf9EeEdelXtHPTghZda3TcHChq1pmmF8cFgkb8g8r4= +github.com/storacha/go-capabilities v0.0.0-20241108115011-2ffd682f2397/go.mod h1:vHqUkLGC11Fhio/2qBJkK8MmA4q1t7DaRVdTIo0UHhE= github.com/storacha/go-metadata v0.0.0-20241021141939-f94d93dcda78 h1:NAti9hMLMo8F0Iyz5ldS41CY6MyukRH0OrTPV4u2340= github.com/storacha/go-metadata v0.0.0-20241021141939-f94d93dcda78/go.mod h1:DcwwQnyFuTk531cKD9sUkQg/gzpwKaIqH9I7oZYyeRc= github.com/storacha/go-ucanto v0.1.1-0.20241028163940-34de8cd912bb h1:lFwFtMjgt162ot9pnu230haLjRQ1rqwJOIAyywOqAX8=