Skip to content

Commit 1325059

Browse files
tock-ibmdenyeart
authored andcommitted
Remove attestation server
The attestation server was a concept that was abandoned during the implementation of the BFT block puller. It is now dead code. The aim of the attestation server was to pull only headers from the delivery server. It was implemented in a simpler fashion by augmenting the `seekInfo.ContentType` with `ab.SeekInfo_HEADER_WITH_SIG` which causes the desired behavior (see common/deliver/deliver.go L338). Signed-off-by: Yoav Tock <[email protected]>
1 parent 7ba0024 commit 1325059

File tree

4 files changed

+0
-386
lines changed

4 files changed

+0
-386
lines changed

common/deliver/deliver.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -413,21 +413,3 @@ func (h *Handler) validateChannelHeader(ctx context.Context, chdr *cb.ChannelHea
413413
func noExpiration(_ []byte) time.Time {
414414
return time.Time{}
415415
}
416-
417-
func (h *Handler) HandleAttestation(ctx context.Context, srv *Server, env *cb.Envelope) error {
418-
status, err := h.deliverBlocks(ctx, srv, env)
419-
if err != nil {
420-
return err
421-
}
422-
423-
err = srv.SendStatusResponse(status)
424-
if status != cb.Status_SUCCESS {
425-
return err
426-
}
427-
if err != nil {
428-
addr := util.ExtractRemoteAddress(ctx)
429-
logger.Warningf("Error sending to %s: %s", addr, err)
430-
return err
431-
}
432-
return nil
433-
}

common/deliver/deliver_test.go

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -764,16 +764,6 @@ var _ = Describe("Deliver", func() {
764764
Expect(resp).To(Equal(cb.Status_SUCCESS))
765765
})
766766

767-
It("HandleAttestation sends requested block", func() {
768-
err := handler.HandleAttestation(context.Background(), server, envelope)
769-
Expect(err).NotTo(HaveOccurred())
770-
Expect(fakeResponseSender.SendBlockResponseCallCount()).To(Equal(1))
771-
b, _, _, _ := fakeResponseSender.SendBlockResponseArgsForCall(0)
772-
Expect(b).To(ProtoEqual(&cb.Block{
773-
Header: &cb.BlockHeader{Number: 100},
774-
}))
775-
})
776-
777767
Context("when sending the success status fails", func() {
778768
BeforeEach(func() {
779769
fakeResponseSender.SendStatusResponseReturns(errors.New("send-success-fails"))
@@ -783,11 +773,6 @@ var _ = Describe("Deliver", func() {
783773
err := handler.Handle(context.Background(), server)
784774
Expect(err).To(MatchError("send-success-fails"))
785775
})
786-
787-
It("HandleAttestation returns the error", func() {
788-
err := handler.HandleAttestation(context.Background(), server, envelope)
789-
Expect(err).To(MatchError("send-success-fails"))
790-
})
791776
})
792777

793778
Context("when receive fails", func() {
@@ -831,15 +816,6 @@ var _ = Describe("Deliver", func() {
831816
resp := fakeResponseSender.SendStatusResponseArgsForCall(0)
832817
Expect(resp).To(Equal(cb.Status_BAD_REQUEST))
833818
})
834-
835-
It("sends a bad envelope to HandleAttestation", func() {
836-
err := handler.HandleAttestation(context.Background(), server, envelope)
837-
Expect(err).NotTo(HaveOccurred())
838-
839-
Expect(fakeResponseSender.SendStatusResponseCallCount()).To(Equal(1))
840-
resp := fakeResponseSender.SendStatusResponseArgsForCall(0)
841-
Expect(resp).To(Equal(cb.Status_BAD_REQUEST))
842-
})
843819
})
844820

845821
Context("when unmarshalling the channel header fails", func() {

orderer/common/server/attestationserver.go

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)