Merge branch 'feat/47-G-fix11-c3d' into feat/47-G-join11
# Conflicts: # modules/distribution/go.mod # modules/distribution/internal/holder/holder_test.go
This commit is contained in:
@@ -158,7 +158,6 @@ type Finding func(kind, subject, words string, raised bool)
|
||||
|
||||
// Holder answers the verbs.
|
||||
type Holder struct {
|
||||
Callers Callers
|
||||
Objects Objects
|
||||
Transfers TransferState
|
||||
Builder Builder
|
||||
@@ -245,9 +244,6 @@ func answerOf(r parts.Received) PublishAnswer {
|
||||
|
||||
// Publish is `publish` on seat for the proved caller.
|
||||
func (h *Holder) Publish(seat, caller string, r PublishRequest) (PublishAnswer, error) {
|
||||
if err := h.Callers.Allowed(VerbPublish, caller); err != nil {
|
||||
return PublishAnswer{}, err
|
||||
}
|
||||
if err := checkPublish(seat, r); err != nil {
|
||||
return PublishAnswer{}, err
|
||||
}
|
||||
@@ -272,9 +268,6 @@ func (h *Holder) Publish(seat, caller string, r PublishRequest) (PublishAnswer,
|
||||
|
||||
// PublishPart is `publish-part`: one chunk, from the caller that opened the transfer alone.
|
||||
func (h *Holder) PublishPart(seat, caller string, r PartRequest) (PublishAnswer, error) {
|
||||
if err := h.Callers.Allowed(VerbPublishPart, caller); err != nil {
|
||||
return PublishAnswer{}, err
|
||||
}
|
||||
got, err := h.receiver().Take(r.Transfer, caller, r.Digest, r.Sequence, r.Last, r.Data, func(t Transfer) error {
|
||||
if t.Shape.Seat != seat {
|
||||
return fmt.Errorf("transfer %s is %s's, not %s's", r.Transfer, t.Shape.Seat, seat)
|
||||
|
||||
Reference in New Issue
Block a user