From ba50776c470b23b0a35a8cb50332548f5637e50b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 18 Aug 2016 14:23:44 +0930 Subject: [PATCH] test_protocol: fix up expected test output. Our implementation now displays things differently, so output changes. Signed-off-by: Rusty Russell --- test/commits/01-offer1.script.expected | 20 +++++++--------- test/commits/02-offer2.script.expected | 20 +++++++--------- test/commits/03-fulfill1.script.expected | 16 ++++--------- .../04-two-commits-onedir.script.expected | 20 +++++++--------- ...e-while-commit-outstanding.script.expected | 20 +++++++--------- .../10-offers-crossover.script.expected | 24 +++++++++---------- .../11-commits-crossover.script.expected | 24 +++++++++---------- test/commits/13-fee.script.expected | 16 ++++--------- test/commits/14-fee-twice.script.expected | 16 ++++--------- 9 files changed, 68 insertions(+), 108 deletions(-) diff --git a/test/commits/01-offer1.script.expected b/test/commits/01-offer1.script.expected index d2fd53794..35e856e23 100644 --- a/test/commits/01-offer1.script.expected +++ b/test/commits/01-offer1.script.expected @@ -1,22 +1,18 @@ ***A*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: 1 - Received htlcs: + Our htlcs: 1 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: - Received htlcs: 1 + Our htlcs: 1 SIGNED ***B*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: - Received htlcs: 1 + Their htlcs: 1 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: 1 - Received htlcs: + Their htlcs: 1 SIGNED diff --git a/test/commits/02-offer2.script.expected b/test/commits/02-offer2.script.expected index d6aa1dc30..e4d9689f9 100644 --- a/test/commits/02-offer2.script.expected +++ b/test/commits/02-offer2.script.expected @@ -1,22 +1,18 @@ ***A*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: 1 3 - Received htlcs: + Our htlcs: 1 3 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: - Received htlcs: 1 3 + Our htlcs: 1 3 SIGNED ***B*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: - Received htlcs: 1 3 + Their htlcs: 1 3 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: 1 3 - Received htlcs: + Their htlcs: 1 3 SIGNED diff --git a/test/commits/03-fulfill1.script.expected b/test/commits/03-fulfill1.script.expected index 75bf74881..79acdd358 100644 --- a/test/commits/03-fulfill1.script.expected +++ b/test/commits/03-fulfill1.script.expected @@ -1,22 +1,14 @@ ***A*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 2: - Offered htlcs: - Received htlcs: SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 2: - Offered htlcs: - Received htlcs: SIGNED ***B*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 2: - Offered htlcs: - Received htlcs: SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 2: - Offered htlcs: - Received htlcs: SIGNED diff --git a/test/commits/04-two-commits-onedir.script.expected b/test/commits/04-two-commits-onedir.script.expected index 69503312d..3aef37e77 100644 --- a/test/commits/04-two-commits-onedir.script.expected +++ b/test/commits/04-two-commits-onedir.script.expected @@ -1,22 +1,18 @@ ***A*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: 1 3 - Received htlcs: + Our htlcs: 1 3 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 2: - Offered htlcs: - Received htlcs: 1 3 + Our htlcs: 1 3 SIGNED ***B*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 2: - Offered htlcs: - Received htlcs: 1 3 + Their htlcs: 1 3 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: 1 3 - Received htlcs: + Their htlcs: 1 3 SIGNED diff --git a/test/commits/06-change-while-commit-outstanding.script.expected b/test/commits/06-change-while-commit-outstanding.script.expected index e924275aa..20a8aee2e 100644 --- a/test/commits/06-change-while-commit-outstanding.script.expected +++ b/test/commits/06-change-while-commit-outstanding.script.expected @@ -1,22 +1,18 @@ ***A*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 2: - Offered htlcs: 1 3 - Received htlcs: + Our htlcs: 1 3 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 2: - Offered htlcs: - Received htlcs: 1 3 + Our htlcs: 1 3 SIGNED ***B*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 2: - Offered htlcs: - Received htlcs: 1 3 + Their htlcs: 1 3 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 2: - Offered htlcs: 1 3 - Received htlcs: + Their htlcs: 1 3 SIGNED diff --git a/test/commits/10-offers-crossover.script.expected b/test/commits/10-offers-crossover.script.expected index 05e3fc579..751ebc204 100644 --- a/test/commits/10-offers-crossover.script.expected +++ b/test/commits/10-offers-crossover.script.expected @@ -1,22 +1,22 @@ ***A*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: 1 - Received htlcs: 2 + Our htlcs: 1 + Their htlcs: 2 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 2: - Offered htlcs: 2 - Received htlcs: 1 + Our htlcs: 1 + Their htlcs: 2 SIGNED ***B*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 2: - Offered htlcs: 2 - Received htlcs: 1 + Our htlcs: 2 + Their htlcs: 1 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: 1 - Received htlcs: 2 + Our htlcs: 2 + Their htlcs: 1 SIGNED diff --git a/test/commits/11-commits-crossover.script.expected b/test/commits/11-commits-crossover.script.expected index 42e5f80ce..56fb201da 100644 --- a/test/commits/11-commits-crossover.script.expected +++ b/test/commits/11-commits-crossover.script.expected @@ -1,22 +1,22 @@ ***A*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 2: - Offered htlcs: 1 - Received htlcs: 2 + Our htlcs: 1 + Their htlcs: 2 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 2: - Offered htlcs: 2 - Received htlcs: 1 + Our htlcs: 1 + Their htlcs: 2 SIGNED ***B*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 2: - Offered htlcs: 2 - Received htlcs: 1 + Our htlcs: 2 + Their htlcs: 1 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 2: - Offered htlcs: 1 - Received htlcs: 2 + Our htlcs: 2 + Their htlcs: 1 SIGNED diff --git a/test/commits/13-fee.script.expected b/test/commits/13-fee.script.expected index 4cda8613d..f96ef363b 100644 --- a/test/commits/13-fee.script.expected +++ b/test/commits/13-fee.script.expected @@ -1,24 +1,16 @@ ***A*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: - Received htlcs: Fee level 1 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: - Received htlcs: SIGNED ***B*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: - Received htlcs: SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: - Received htlcs: Fee level 1 SIGNED diff --git a/test/commits/14-fee-twice.script.expected b/test/commits/14-fee-twice.script.expected index 3f869be70..084b88253 100644 --- a/test/commits/14-fee-twice.script.expected +++ b/test/commits/14-fee-twice.script.expected @@ -1,24 +1,16 @@ ***A*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: - Received htlcs: Fee level 2 SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: - Received htlcs: SIGNED ***B*** -LOCAL COMMITS: +LOCAL COMMIT: Commit 1: - Offered htlcs: - Received htlcs: SIGNED -REMOTE COMMITS: +REMOTE COMMIT: Commit 1: - Offered htlcs: - Received htlcs: Fee level 2 SIGNED