From b4594551f768589d1c6a36177f3ad2f0cadf6157 Mon Sep 17 00:00:00 2001
From: Martin Atkins <mart@degeneration.co.uk>
Date: Tue, 14 Sep 2021 15:19:28 -0700
Subject: [PATCH] refactoring: TestValidateMoves/cyclic_chain can now pass

When originally filling out these test cases we didn't yet have the logic
in place to detect chained moves and so this test couldn't succeed in
spite of being correct.

We now have chain-detection implemented and so consequently we can also
detect cyclic chains. This commit largely just enables the original test
unchanged, although it does include the text of the final error message
for reporting cyclic move chains which wasn't yet finalized when we were
stubbing out this test case originally.
---
 internal/refactoring/move_validate_test.go | 48 +++++++++++-----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/internal/refactoring/move_validate_test.go b/internal/refactoring/move_validate_test.go
index 5ab83d3aa2..7ec8ab2f9e 100644
--- a/internal/refactoring/move_validate_test.go
+++ b/internal/refactoring/move_validate_test.go
@@ -129,31 +129,31 @@ func TestValidateMoves(t *testing.T) {
 			},
 			WantError: `Redundant move statement: This statement declares a move from module.a to the same address, which is the same as not declaring this move at all.`,
 		},
-		/*
-			// TODO: This test can't pass until we've implemented
-			// addrs.MoveEndpointInModule.CanChainFrom, which is what
-			// detects the chaining condition this is testing for.
-			"cyclic chain": {
-				Statements: []MoveStatement{
-					makeTestMoveStmt(t,
-						``,
-						`module.a`,
-						`module.b`,
-					),
-					makeTestMoveStmt(t,
-						``,
-						`module.b`,
-						`module.c`,
-					),
-					makeTestMoveStmt(t,
-						``,
-						`module.c`,
-						`module.a`,
-					),
-				},
-				WantError: `bad cycle`,
+		"cyclic chain": {
+			Statements: []MoveStatement{
+				makeTestMoveStmt(t,
+					``,
+					`module.a`,
+					`module.b`,
+				),
+				makeTestMoveStmt(t,
+					``,
+					`module.b`,
+					`module.c`,
+				),
+				makeTestMoveStmt(t,
+					``,
+					`module.c`,
+					`module.a`,
+				),
 			},
-		*/
+			WantError: `Cyclic dependency in move statements: The following chained move statements form a cycle, and so there is no final location to move objects to:
+  - test:1,1: module.a[*] → module.b[*]
+  - test:1,1: module.b[*] → module.c[*]
+  - test:1,1: module.c[*] → module.a[*]
+
+A chain of move statements must end with an address that doesn't appear in any other statements, and which typically also refers to an object still declared in the configuration.`,
+		},
 		"module.single as a call still exists in configuration": {
 			Statements: []MoveStatement{
 				makeTestMoveStmt(t,