Skip to content

Commit fcf1b7a

Browse files
author
Manoranjith
committed
Update tests for proposal ID generation
- Since, the proposal ID is now a random identifier, generated when creating a channel proposal, its value does not change when channel proposal parameters change. - Update the tests accordingly. Signed-off-by: Manoranjith <ponraj.manoranjitha@in.bosch.com>
1 parent c082905 commit fcf1b7a

File tree

1 file changed

+5
-87
lines changed

1 file changed

+5
-87
lines changed

client/proposalmsgs_test.go

Lines changed: 5 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -79,68 +79,21 @@ func TestChannelProposalReqSerialization(t *testing.T) {
7979
func TestLedgerChannelProposalReqProposalID(t *testing.T) {
8080
rng := pkgtest.Prng(t)
8181
original := *client.NewRandomLedgerChannelProposal(rng)
82-
s := original.ProposalID()
83-
fake := *client.NewRandomLedgerChannelProposal(rng)
84-
85-
assert.NotEqual(t, original.ChallengeDuration, fake.ChallengeDuration)
86-
assert.NotEqual(t, original.NonceShare, fake.NonceShare)
87-
assert.NotEqual(t, original.App, fake.App)
88-
89-
c0 := original
90-
c0.ChallengeDuration = fake.ChallengeDuration
91-
assert.NotEqual(t, s, c0.ProposalID())
92-
93-
c1 := original
94-
c1.NonceShare = fake.NonceShare
95-
assert.NotEqual(t, s, c1.ProposalID())
96-
97-
c2 := original
98-
c2.Participant = fake.Participant
99-
assert.NotEqual(t, s, c2.ProposalID())
10082

101-
c3 := original
102-
c3.App = fake.App
103-
assert.NotEqual(t, s, c3.ProposalID())
104-
105-
c4 := original
106-
c4.InitData = fake.InitData
107-
assert.NotEqual(t, s, c4.ProposalID())
108-
109-
c5 := original
110-
c5.InitBals = fake.InitBals
111-
assert.NotEqual(t, s, c5.ProposalID())
83+
fake := *client.NewRandomLedgerChannelProposal(rng)
11284

113-
c6 := original
114-
c6.Peers = fake.Peers
115-
assert.NotEqual(t, s, c6.ProposalID())
85+
assert.NotEqual(t, original.ProposalID, fake.ProposalID)
11686
}
11787

11888
func TestSubChannelProposalReqProposalID(t *testing.T) {
11989
rng := pkgtest.Prng(t)
12090
original, err := clienttest.NewRandomSubChannelProposal(rng)
12191
require.NoError(t, err)
122-
s := original.ProposalID()
92+
12393
fake, err := clienttest.NewRandomSubChannelProposal(rng)
12494
require.NoError(t, err)
12595

126-
assert.NotEqual(t, original.ChallengeDuration, fake.ChallengeDuration)
127-
assert.NotEqual(t, original.NonceShare, fake.NonceShare)
128-
129-
c0 := original
130-
c0.ChallengeDuration = fake.ChallengeDuration
131-
assert.NotEqual(t, s, c0.ProposalID())
132-
133-
c1 := original
134-
c1.NonceShare = fake.NonceShare
135-
assert.NotEqual(t, s, c1.ProposalID())
136-
137-
c2 := original
138-
c2.Parent = fake.Parent
139-
assert.NotEqual(t, s, c2.ProposalID())
140-
141-
c3 := original
142-
c3.InitBals = fake.InitBals
143-
assert.NotEqual(t, s, c3.ProposalID())
96+
assert.NotEqual(t, original.ProposalID, fake.ProposalID)
14497
}
14598

14699
func TestVirtualChannelProposalReqProposalID(t *testing.T) {
@@ -156,42 +109,7 @@ func TestVirtualChannelProposalReqProposalID(t *testing.T) {
156109
assert.Equal(t, channel.NoApp(), fake.App, "virtual channel should always has no app")
157110
assert.Equal(t, channel.NoData(), fake.InitData, "virtual channel should always has no data")
158111

159-
assert.NotEqual(t, original.ChallengeDuration, fake.ChallengeDuration)
160-
assert.NotEqual(t, original.NonceShare, fake.NonceShare)
161-
assert.NotEqual(t, original.InitBals, fake.InitBals)
162-
assert.NotEqual(t, original.FundingAgreement, fake.FundingAgreement)
163-
assert.NotEqual(t, original.Proposer, fake.Proposer)
164-
assert.NotEqual(t, original.Peers, fake.Peers)
165-
assert.NotEqual(t, original.Parents, fake.Parents)
166-
assert.NotEqual(t, original.IndexMaps, fake.IndexMaps)
167-
168-
testProp := *original
169-
testProp.ChallengeDuration = fake.ChallengeDuration
170-
assert.NotEqual(t, original.ProposalID(), testProp.ProposalID())
171-
172-
testProp = *original
173-
testProp.NonceShare = fake.NonceShare
174-
assert.NotEqual(t, original.ProposalID(), testProp.ProposalID())
175-
176-
testProp = *original
177-
testProp.InitBals = fake.InitBals
178-
assert.NotEqual(t, original.ProposalID(), testProp.ProposalID())
179-
180-
testProp = *original
181-
testProp.FundingAgreement = fake.FundingAgreement
182-
assert.NotEqual(t, original.ProposalID(), testProp.ProposalID())
183-
184-
testProp = *original
185-
testProp.Proposer = fake.Proposer
186-
assert.NotEqual(t, original.ProposalID(), testProp.ProposalID())
187-
188-
testProp = *original
189-
testProp.Peers = fake.Peers
190-
assert.NotEqual(t, original.ProposalID(), testProp.ProposalID())
191-
192-
testProp = *original
193-
testProp.IndexMaps = fake.IndexMaps
194-
assert.NotEqual(t, original.ProposalID(), testProp.ProposalID())
112+
assert.NotEqual(t, original.ProposalID, fake.ProposalID)
195113
}
196114

197115
func TestChannelProposalAccSerialization(t *testing.T) {

0 commit comments

Comments
 (0)