Refuse delivery-plan and forget-checks by name and take a merge's warrant from the teller alone, no longer mesh-delivery's (issue 1318, C3, ADR 0450 §8)

cmd/mesh-controller/moved_asker_test.go

@@ -48,18 +48,19 @@ func TestAMergeNamingTheTellerIsMovedOnTheTellersWarrant(t *testing.T) {
 	}
 }
 
-// 1213/AC2: an announcement naming mesh-delivery, or none (today's module): read under mesh-delivery, registered.
-func TestAMergeNamingNoAskerIsMovedOnMeshDeliverysWarrant(t *testing.T) {
+// 1318 (ADR 0450 §8): a merge naming no asker, or the asker mesh-delivery of before the gate, registers no move; the
+// teller's is taken, and its warrant read under its name.
+func TestAMergeOfMeshDeliveryOrNoAskerMovesNothing(t *testing.T) {
 	for _, named := range []string{"", theDelivery} {
 		a := askedBy(t, named, theDelivery)
-		if _, err := movedOnApprove(a.merge, &a.ask, &a.warrant); err != nil {
-			t.Errorf("asker %q: refused: %v", named, err)
+		if _, err := movedOnApprove(a.merge, &a.ask, &a.warrant); err == nil || !strings.Contains(err.Error(), "ADR 0450 §8") {
+			t.Errorf("asker %q: %v", named, err)
 		}
 	}
 	was := routerAskOf
 	wasKept := keptDeliveryMerge
 	t.Cleanup(func() { routerAskOf, keptDeliveryMerge = was, wasKept })
-	a := askedBy(t, "", theDelivery)
+	a := askedBy(t, sdkdelivery.TellerModule, sdkdelivery.TellerModule)
 	keptDeliveryMerge = func(context.Context, string, string, int, string) (deliveryMerge, bool, error) {
 		return a.merge, true, nil
 	}
@@ -71,8 +72,8 @@ func TestAMergeNamingNoAskerIsMovedOnMeshDeliverysWarrant(t *testing.T) {
 	if _, err := approvedAnnounced(t.Context(), nil, "novox", "mesh-controller", announcedPull(7, a.merge.HeadSHA)); err != nil {
 		t.Fatal(err)
 	}
-	if readUnder != theDelivery {
-		t.Errorf("with no asker named the warrant was read under %q, not %q", readUnder, theDelivery)
+	if readUnder != sdkdelivery.TellerModule {
+		t.Errorf("the warrant was read under %q, not %q", readUnder, sdkdelivery.TellerModule)
 	}
 }