rhp/v4: Rename streaming RPCs

SiaFoundation · Oct 28, 2024 · 79ba0d1 · 79ba0d1
1 parent 8319d41
commit 79ba0d1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 33 deletions.
diff --git a/rhp/v4/encoding.go b/rhp/v4/encoding.go
@@ -501,40 +501,29 @@ func (r *RPCReadSectorRequest) maxLen() int {
 
 func (r *RPCReadSectorResponse) encodeTo(e *types.Encoder) {
 	types.EncodeSlice(e, r.Proof)
-	e.WriteBytes(r.Sector)
+	e.WriteUint64(r.DataLength)
 }
 func (r *RPCReadSectorResponse) decodeFrom(d *types.Decoder) {
-	types.DecodeSlice(d, &r.Proof)
-	r.Sector = d.ReadBytes()
-}
-func (r *RPCReadSectorResponse) maxLen() int {
-	return reasonableObjectSize + 8 + SectorSize
-}
-
-func (r *RPCReadSectorStreamedResponse) encodeTo(e *types.Encoder) {
-	panic("use RPCReadSectorResponse") // developer error
-}
-func (r *RPCReadSectorStreamedResponse) decodeFrom(d *types.Decoder) {
 	types.DecodeSlice(d, &r.Proof)
 	r.DataLength = d.ReadUint64()
 }
-func (r *RPCReadSectorStreamedResponse) maxLen() int {
+func (r *RPCReadSectorResponse) maxLen() int {
 	return reasonableObjectSize + 8 + SectorSize
 }
 
-func (r RPCWriteSectorStreamingRequest) encodeTo(e *types.Encoder) {
+func (r RPCWriteSectorRequest) encodeTo(e *types.Encoder) {
 	r.Prices.EncodeTo(e)
 	r.Token.encodeTo(e)
 	e.WriteUint64(r.Duration)
 	e.WriteUint64(r.DataLength)
 }
-func (r *RPCWriteSectorStreamingRequest) decodeFrom(d *types.Decoder) {
+func (r *RPCWriteSectorRequest) decodeFrom(d *types.Decoder) {
 	r.Prices.DecodeFrom(d)
 	r.Token.decodeFrom(d)
 	r.Duration = d.ReadUint64()
 	r.DataLength = d.ReadUint64()
 }
-func (r *RPCWriteSectorStreamingRequest) maxLen() int {
+func (r *RPCWriteSectorRequest) maxLen() int {
 	return sizeofPrices + sizeofAccountToken + 8 + 8
 }
 

diff --git a/rhp/v4/rhp.go b/rhp/v4/rhp.go
@@ -416,32 +416,18 @@ type (
 
 	// RPCReadSectorResponse implements Object.
 	RPCReadSectorResponse struct {
-		Proof  []types.Hash256 `json:"proof"`
-		Sector []byte          `json:"sector"`
-	}
-
-	// RPCReadSectorStreamedResponse implements Object.
-	RPCReadSectorStreamedResponse struct {
 		Proof      []types.Hash256 `json:"proof"`
 		DataLength uint64          `json:"dataLength"`
 	}
 
-	// RPCWriteSectorStreamingRequest implements Object.
-	RPCWriteSectorStreamingRequest struct {
+	// RPCWriteSectorRequest implements Object.
+	RPCWriteSectorRequest struct {
 		Prices     HostPrices   `json:"prices"`
 		Token      AccountToken `json:"token"`
 		Duration   uint64       `json:"duration"`
 		DataLength uint64       `json:"dataLength"` // extended to SectorSize by host
 	}
 
-	// RPCWriteSectorRequest implements Object.
-	RPCWriteSectorRequest struct {
-		Prices   HostPrices   `json:"prices"`
-		Token    AccountToken `json:"token"`
-		Duration uint64       `json:"duration"`
-		Sector   []byte       `json:"sector"` // extended to SectorSize by host
-	}
-
 	// RPCWriteSectorResponse implements Object.
 	RPCWriteSectorResponse struct {
 		Root types.Hash256 `json:"root"`

diff --git a/rhp/v4/validation.go b/rhp/v4/validation.go
@@ -26,7 +26,7 @@ func (req *RPCReadSectorRequest) Validate(pk types.PublicKey) error {
 }
 
 // Validate validates a write sector request.
-func (req *RPCWriteSectorStreamingRequest) Validate(pk types.PublicKey, maxDuration uint64) error {
+func (req *RPCWriteSectorRequest) Validate(pk types.PublicKey, maxDuration uint64) error {
 	if err := req.Prices.Validate(pk); err != nil {
 		return fmt.Errorf("prices are invalid: %w", err)
 	} else if err := req.Token.Validate(); err != nil {