Skip to content

Commit

Permalink
test/test_protocol: rename internally to match updated 02-wire-protoc…
Browse files Browse the repository at this point in the history
…ol.md

Signed-off-by: Rusty Russell <[email protected]>
rustyrussell committed May 17, 2016
1 parent 06d2c19 commit e46a2ed
Showing 11 changed files with 193 additions and 129 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -242,7 +242,7 @@ check-makefile: check-daemon-makefile

# Any mention of BOLT# must be followed by an exact quote, modulo whitepace.
check-source-bolt: check-bolt
@if [ ! -d $(BOLTDIR) ]; then echo Not checking BOLT references: BOLTDIR $(BOLTDIR) does not exist >&2; else ./check-bolt $(BOLTDIR) $(CORE_SRC) $(BITCOIN_SRC) $(DAEMON_SRC) $(CORE_HEADERS) $(BITCOIN_HEADERS) $(DAEMON_HEADERS); fi
@if [ ! -d $(BOLTDIR) ]; then echo Not checking BOLT references: BOLTDIR $(BOLTDIR) does not exist >&2; else ./check-bolt $(BOLTDIR) $(CORE_SRC) $(BITCOIN_SRC) $(DAEMON_SRC) $(CORE_HEADERS) $(BITCOIN_HEADERS) $(DAEMON_HEADERS) $(TEST_PROGRAMS:=.c); fi

check-bolt: check-bolt.o $(CCAN_OBJS)

8 changes: 4 additions & 4 deletions test/commits/01-offer1.script.expected
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
***A***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs: 1
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs:
Received htlcs: 1
SIGNED
***B***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs:
Received htlcs: 1
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs: 1
Received htlcs:
8 changes: 4 additions & 4 deletions test/commits/02-offer2.script.expected
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
***A***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs: 1 3
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs:
Received htlcs: 1 3
SIGNED
***B***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs:
Received htlcs: 1 3
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs: 1 3
Received htlcs:
8 changes: 4 additions & 4 deletions test/commits/03-fulfill1.script.expected
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
***A***
OUR COMMITS:
LOCAL COMMITS:
Commit 2:
Offered htlcs:
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 2:
Offered htlcs:
Received htlcs:
SIGNED
***B***
OUR COMMITS:
LOCAL COMMITS:
Commit 2:
Offered htlcs:
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 2:
Offered htlcs:
Received htlcs:
8 changes: 4 additions & 4 deletions test/commits/04-two-commits-onedir.script.expected
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
***A***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs: 1 3
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 2:
Offered htlcs:
Received htlcs: 1 3
SIGNED
***B***
OUR COMMITS:
LOCAL COMMITS:
Commit 2:
Offered htlcs:
Received htlcs: 1 3
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs: 1 3
Received htlcs:
8 changes: 4 additions & 4 deletions test/commits/05-two-commits-in-flight.script.expected
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
***A***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs: 1 3
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 2:
Offered htlcs:
Received htlcs: 1 3
SIGNED
***B***
OUR COMMITS:
LOCAL COMMITS:
Commit 2:
Offered htlcs:
Received htlcs: 1 3
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs: 1 3
Received htlcs:
8 changes: 4 additions & 4 deletions test/commits/10-commits-crossover.script.expected
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
***A***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs: 1
Received htlcs: 2
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 2:
Offered htlcs: 2
Received htlcs: 1
SIGNED
***B***
OUR COMMITS:
LOCAL COMMITS:
Commit 2:
Offered htlcs: 2
Received htlcs: 1
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs: 1
Received htlcs: 2
8 changes: 4 additions & 4 deletions test/commits/13-fee.script.expected
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
***A***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
Fee level 1
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
SIGNED
***B***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
8 changes: 4 additions & 4 deletions test/commits/14-fee-twice.script.expected
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
***A***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
Fee level 2
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
SIGNED
***B***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
30 changes: 15 additions & 15 deletions test/commits/15-fee-twice-back-to-back.script.expected
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
***A after two commits with fee changes***
OUR COMMITS:
LOCAL COMMITS:
Commit 0:
Offered htlcs:
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 0:
Offered htlcs:
Received htlcs:
Pending incoming: FEE
Pending unacked: FEE
SIGNED
Commit 1:
Offered htlcs:
Received htlcs:
Pending incoming: FEE
Pending unacked: FEE
SIGNED
Commit 2:
Offered htlcs:
Received htlcs:
SIGNED
***B after receiving fee change***
OUR COMMITS:
LOCAL COMMITS:
Commit 0:
Offered htlcs:
Received htlcs:
Pending incoming: FEE
Pending unacked: FEE
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 0:
Offered htlcs:
Received htlcs:
SIGNED
***B after receiving first commit***
OUR COMMITS:
LOCAL COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 0:
Offered htlcs:
Received htlcs:
Pending outgoing
Pending acked
SIGNED
***B after receiving second commit***
OUR COMMITS:
LOCAL COMMITS:
Commit 2:
Offered htlcs:
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 0:
Offered htlcs:
Received htlcs:
Pending outgoing
Pending acked
SIGNED
***B after committing***
OUR COMMITS:
LOCAL COMMITS:
Commit 2:
Offered htlcs:
Received htlcs:
SIGNED
THEIR COMMITS:
REMOTE COMMITS:
Commit 1:
Offered htlcs:
Received htlcs:
226 changes: 145 additions & 81 deletions test/test_protocol.c

Large diffs are not rendered by default.

0 comments on commit e46a2ed

Please sign in to comment.