refactor(pdp): remove pdp prefix

storacha · Nov 10, 2024 · 57dd97c · 57dd97c
1 parent bf7f230
commit 57dd97c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 40 deletions.
diff --git a/go.sum b/go.sum
@@ -524,8 +524,6 @@ 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-piece v0.0.0-20241102032446-a7c497f05d55 h1:ABw9NOKkodPOWFpQteAI1ImNaHtsxnPtz6sAUhU/HLA=
 github.com/storacha/go-piece v0.0.0-20241102032446-a7c497f05d55/go.mod h1:lV3s4aCpSZn9srVjfDTsIAqx3MbO8Y/7JH2M/esSZcM=
-github.com/storacha/go-ucanto v0.2.1-0.20241101213013-d4cff4a75f56 h1:hfkgsM0DJy8+jzlN/lzLyVCxjp6k447QWfU+Gy6YA9w=
-github.com/storacha/go-ucanto v0.2.1-0.20241101213013-d4cff4a75f56/go.mod h1:7ba9jAgqmwlF/JfyFUQcGV07uiYNlmJNu8qH4hHtrJk=
 github.com/storacha/go-ucanto v0.2.1-0.20241105025747-aa8566a3a3fb h1:aVHQtqE67jU9krIyZBYwFgFq+bkzEu66O0hrpTO5beQ=
 github.com/storacha/go-ucanto v0.2.1-0.20241105025747-aa8566a3a3fb/go.mod h1:7ba9jAgqmwlF/JfyFUQcGV07uiYNlmJNu8qH4hHtrJk=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

diff --git a/pkg/pdp/pdp.go b/pkg/pdp/pdp.go
@@ -16,7 +16,7 @@ import (
 	"github.com/storacha/go-ucanto/validator"
 )
 
-const PDPAcceptAbility = "pdp/accept"
+const AcceptAbility = "pdp/accept"
 
 //go:embed pdp.ipldsch
 var pdpSchema []byte
@@ -31,78 +31,78 @@ func mustLoadTS() *ipldschema.TypeSystem {
 	return ts
 }
 
-func PDPAcceptCaveatsType() ipldschema.Type {
-	return pdpTS.TypeByName("PDPAcceptCaveats")
+func AcceptCaveatsType() ipldschema.Type {
+	return pdpTS.TypeByName("AcceptCaveats")
 }
 
-func PDPAcceptOkType() ipldschema.Type {
-	return pdpTS.TypeByName("PDPAcceptOk")
+func AcceptOkType() ipldschema.Type {
+	return pdpTS.TypeByName("AcceptOk")
 }
 
-func PDPInfoCaveatsType() ipldschema.Type {
-	return pdpTS.TypeByName("PDPInfoCaveats")
+func InfoCaveatsType() ipldschema.Type {
+	return pdpTS.TypeByName("InfoCaveats")
 }
 
-func PDPInfoOkType() ipldschema.Type {
-	return pdpTS.TypeByName("PDPInfoOk")
+func InfoOkType() ipldschema.Type {
+	return pdpTS.TypeByName("InfoOk")
 }
 
-type PDPAcceptCaveats struct {
+type AcceptCaveats struct {
 	Piece piece.PieceLink
 }
 
-func (pc PDPAcceptCaveats) ToIPLD() (datamodel.Node, error) {
-	return ipld.WrapWithRecovery(&pc, PDPAcceptCaveatsType(), types.Converters...)
+func (ac AcceptCaveats) ToIPLD() (datamodel.Node, error) {
+	return ipld.WrapWithRecovery(&ac, AcceptCaveatsType(), types.Converters...)
 }
 
-var PDPAcceptCaveatsReader = schema.Struct[PDPAcceptCaveats](PDPAcceptCaveatsType(), nil, types.Converters...)
+var AcceptCaveatsReader = schema.Struct[AcceptCaveats](AcceptCaveatsType(), nil, types.Converters...)
 
-var PDPAccept = validator.NewCapability(
-	PDPAcceptAbility,
+var Accept = validator.NewCapability(
+	AcceptAbility,
 	schema.DIDString(),
-	PDPAcceptCaveatsReader,
+	AcceptCaveatsReader,
 	validator.DefaultDerives,
 )
 
-type PDPAcceptOk struct {
+type AcceptOk struct {
 	Aggregate      piece.PieceLink
 	InclusionProof merkletree.ProofData
 	Piece          piece.PieceLink
 }
 
-func (po PDPAcceptOk) ToIPLD() (datamodel.Node, error) {
-	return ipld.WrapWithRecovery(&po, PDPAcceptOkType(), types.Converters...)
+func (ao AcceptOk) ToIPLD() (datamodel.Node, error) {
+	return ipld.WrapWithRecovery(&ao, AcceptOkType(), types.Converters...)
 }
 
-const PDPInfoAbility = "pdp/info"
+const InfoAbility = "pdp/info"
 
-type PDPInfoCaveats struct {
+type InfoCaveats struct {
 	Piece piece.PieceLink
 }
 
-func (pi PDPInfoCaveats) ToIPLD() (datamodel.Node, error) {
-	return ipld.WrapWithRecovery(&pi, PDPInfoCaveatsType(), types.Converters...)
+func (ic InfoCaveats) ToIPLD() (datamodel.Node, error) {
+	return ipld.WrapWithRecovery(&ic, InfoCaveatsType(), types.Converters...)
 }
 
-var PDPInfoCaveatsReader = schema.Struct[PDPInfoCaveats](PDPInfoCaveatsType(), nil, types.Converters...)
+var InfoCaveatsReader = schema.Struct[InfoCaveats](InfoCaveatsType(), nil, types.Converters...)
 
-var PDPInfo = validator.NewCapability(
-	PDPInfoAbility,
+var Info = validator.NewCapability(
+	InfoAbility,
 	schema.DIDString(),
-	PDPInfoCaveatsReader,
+	InfoCaveatsReader,
 	validator.DefaultDerives,
 )
 
-type PDPInfoAcceptedAggregate struct {
+type InfoAcceptedAggregate struct {
 	Aggregate      piece.PieceLink
 	InclusionProof merkletree.ProofData
 }
 
-type PDPInfoOk struct {
+type InfoOk struct {
 	Piece      piece.PieceLink
-	Aggregates []PDPInfoAcceptedAggregate
+	Aggregates []InfoAcceptedAggregate
 }
 
-func (po PDPInfoOk) ToIPLD() (datamodel.Node, error) {
-	return ipld.WrapWithRecovery(&po, PDPInfoOkType(), types.Converters...)
+func (io InfoOk) ToIPLD() (datamodel.Node, error) {
+	return ipld.WrapWithRecovery(&io, InfoOkType(), types.Converters...)
 }
diff --git a/pkg/pdp/pdp.ipldsch b/pkg/pdp/pdp.ipldsch
@@ -1,7 +1,7 @@
 type Node bytes
 type PieceLink link
 
-type PDPAcceptCaveats struct {
+type AcceptCaveats struct {
 	piece   PieceLink
 }
 
@@ -10,22 +10,22 @@ type ProofData struct {
 	index Int
 }
 
-type PDPAcceptOk struct {
+type AcceptOk struct {
 	aggregate      PieceLink
 	inclusionProof ProofData
 	piece          PieceLink
 }
 
-type PDPInfoCaveats struct {
+type InfoCaveats struct {
 	piece   PieceLink
 }
 
-type PDPInfoAcceptedAggregate struct {
+type InfoAcceptedAggregate struct {
 	aggregate 		 PieceLink
 	inclusionProof ProofData
 }
 
-type PDPInfoOk struct {
+type InfoOk struct {
 	piece          PieceLink
-	aggregates     [PDPInfoAcceptedAggregate]
+	aggregates     [InfoAcceptedAggregate]
 }