Merge pull request #376 from ava-labs/always-send-chits

send current preferences even when fetching dependencies fails

Author: StephenButtolph

snow/engine/avalanche/convincer.go

@@ -16,6 +16,7 @@ type convincer struct {
 	sender    common.Sender
 	vdr       ids.ShortID
 	requestID uint32
+	sent      bool
 	abandoned bool
 	deps      ids.Set
 	errs      *wrappers.Errs
@@ -30,12 +31,16 @@ func (c *convincer) Fulfill(id ids.ID) {
 }
 
 // Abandon this attempt to send chits.
-func (c *convincer) Abandon(ids.ID) { c.abandoned = true }
+func (c *convincer) Abandon(ids.ID) {
+	c.abandoned = true
+	c.Update()
+}
 
 func (c *convincer) Update() {
-	if c.abandoned || c.deps.Len() != 0 || c.errs.Errored() {
+	if c.sent || c.errs.Errored() || (!c.abandoned && c.deps.Len() != 0) {
 		return
 	}
+	c.sent = true
 
 	c.sender.Chits(c.vdr, c.requestID, c.consensus.Preferences().List())
 }

snow/engine/avalanche/transitive_test.go

@@ -727,6 +727,7 @@ func TestEngineAbandonResponse(t *testing.T) {
 	sender.GetF = func(vID ids.ShortID, requestID uint32, vtxID ids.ID) {
 		*reqID = requestID
 	}
+	sender.CantChits = false
 
 	if err := te.PullQuery(vdr, 0, vtx.ID()); err != nil {
 		t.Fatal(err)
@@ -2341,6 +2342,7 @@ func TestEngineReissueAbortedVertex(t *testing.T) {
 
 	sender.GetF = nil
 	manager.ParseF = nil
+	sender.CantChits = false
 
 	if err := te.GetFailed(vdr, *requestID); err != nil {
 		t.Fatal(err)

snow/engine/snowman/convincer.go

@@ -16,6 +16,7 @@ type convincer struct {
 	sender    common.Sender
 	vdr       ids.ShortID
 	requestID uint32
+	sent      bool
 	abandoned bool
 	deps      ids.Set
 	errs      *wrappers.Errs
@@ -30,12 +31,16 @@ func (c *convincer) Fulfill(id ids.ID) {
 }
 
 // Abandon this attempt to send chits.
-func (c *convincer) Abandon(ids.ID) { c.abandoned = true }
+func (c *convincer) Abandon(ids.ID) {
+	c.abandoned = true
+	c.Update()
+}
 
 func (c *convincer) Update() {
-	if c.abandoned || c.deps.Len() != 0 || c.errs.Errored() {
+	if c.sent || c.errs.Errored() || (!c.abandoned && c.deps.Len() != 0) {
 		return
 	}
+	c.sent = true
 
 	pref := []ids.ID{c.consensus.Preference()}
 	c.sender.Chits(c.vdr, c.requestID, pref)

snow/engine/snowman/transitive_test.go

@@ -1057,6 +1057,8 @@ func TestEngineAbandonQuery(t *testing.T) {
 		t.Fatalf("Should have blocked on request")
 	}
 
+	sender.CantChits = false
+
 	if err := te.GetFailed(vdr, *reqID); err != nil {
 		t.Fatal(err)
 	}
@@ -1306,6 +1308,7 @@ func TestEngineRetryFetch(t *testing.T) {
 
 	vm.CantGetBlock = true
 	sender.GetF = nil
+	sender.CantChits = false
 
 	if err := te.GetFailed(vdr, *reqID); err != nil {
 		t.Fatal(err)