@@ -61,6 +61,24 @@ public void tupleInCorrectOp() {
6161 .build ();
6262 }
6363
64+ @ Test (expected =LogQueryException .class )
65+ public void tupleIncorrectTopic2 () {
66+ LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
67+ .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
68+ null )
69+ .setOpTopic0_1 (LogOp .AND )
70+ .build ();
71+ }
72+
73+ @ Test (expected =LogQueryException .class )
74+ public void tupleIncorrectTopic1 () {
75+ LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
76+ .topic (null ,
77+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" )
78+ .setOpTopic0_1 (LogOp .AND )
79+ .build ();
80+ }
81+
6482@ Test
6583public void tripleCorrect () {
6684LogQuery triple =LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" ,379224 ,400000 )
@@ -104,7 +122,7 @@ public void tripleInCorrectTopic1() {
104122public void tripleInCorrectTopic2 () {
105123LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" ,379224 ,400000 )
106124 .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
107- " null" ,
125+ null ,
108126"0x72657075746174696f6e00000000000000000000000000000000000000000000" )
109127 .setOpTopic0_1 (LogOp .AND )
110128 .setOpTopic0_2 (null )
@@ -117,13 +135,49 @@ public void tripleInCorrectTopic3() {
117135LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" ,379224 ,400000 )
118136 .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
119137"0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
120- "null" )
138+ null )
139+ .setOpTopic0_1 (LogOp .AND )
140+ .setOpTopic0_2 (null )
141+ .setOpTopic1_2 (LogOp .AND )
142+ .build ();
143+ }
144+
145+ @ Test (expected =LogQueryException .class )
146+ public void tripleInCorrectOp1 () {
147+ LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" ,379224 ,400000 )
148+ .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
149+ "0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
150+ "0x72657075746174696f6e00000000000000000000000000000000000000000000" )
151+ .setOpTopic0_1 (null )
152+ .setOpTopic0_2 (LogOp .AND )
153+ .setOpTopic1_2 (LogOp .AND )
154+ .build ();
155+ }
156+
157+ @ Test (expected =LogQueryException .class )
158+ public void tripleInCorrectOp2 () {
159+ LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" ,379224 ,400000 )
160+ .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
161+ "0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
162+ "0x72657075746174696f6e00000000000000000000000000000000000000000000" )
121163 .setOpTopic0_1 (LogOp .AND )
122164 .setOpTopic0_2 (null )
123165 .setOpTopic1_2 (LogOp .AND )
124166 .build ();
125167 }
126168
169+ @ Test (expected =LogQueryException .class )
170+ public void tripleInCorrectOp3 () {
171+ LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" ,379224 ,400000 )
172+ .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
173+ "0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
174+ "0x72657075746174696f6e00000000000000000000000000000000000000000000" )
175+ .setOpTopic0_1 (LogOp .AND )
176+ .setOpTopic0_2 (LogOp .AND )
177+ .setOpTopic1_2 (null )
178+ .build ();
179+ }
180+
127181@ Test
128182public void quadroCorrect () {
129183LogQuery quadro =LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
@@ -160,28 +214,26 @@ public void quadroIncorrectTopic2() {
160214 }
161215
162216@ Test (expected =LogQueryException .class )
163- public void tupleIncorrectTopic2 () {
164- LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
165- .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
166- null )
167- .setOpTopic0_1 (LogOp .AND )
168- .build ();
169- }
170-
171- @ Test (expected =LogQueryException .class )
172- public void tupleIncorrectTopic1 () {
217+ public void quadroIncorrectTopic1 () {
173218LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
174219 .topic (null ,
175- "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" )
220+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
221+ "0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
222+ "0x72657075746174696f6e00000000000000000000000000000000000000000000" )
176223 .setOpTopic0_1 (LogOp .AND )
224+ .setOpTopic0_2 (LogOp .OR )
225+ .setOpTopic0_3 (LogOp .AND )
226+ .setOpTopic1_2 (LogOp .OR )
227+ .setOpTopic1_3 (LogOp .OR )
228+ .setOpTopic2_3 (LogOp .OR )
177229 .build ();
178230 }
179231
180232@ Test (expected =LogQueryException .class )
181233public void quadroIncorrectOp1 () {
182234LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
183235 .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
184- null ,
236+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
185237"0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
186238"0x72657075746174696f6e00000000000000000000000000000000000000000000" )
187239 .setOpTopic0_1 (null )
@@ -197,7 +249,7 @@ public void quadroIncorrectOp1() {
197249public void quadroIncorrectOp2 () {
198250LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
199251 .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
200- null ,
252+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
201253"0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
202254"0x72657075746174696f6e00000000000000000000000000000000000000000000" )
203255 .setOpTopic0_1 (LogOp .AND )
@@ -213,7 +265,7 @@ public void quadroIncorrectOp2() {
213265public void quadroIncorrectOp3 () {
214266LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
215267 .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
216- null ,
268+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
217269"0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
218270"0x72657075746174696f6e00000000000000000000000000000000000000000000" )
219271 .setOpTopic0_1 (LogOp .AND )
@@ -246,8 +298,8 @@ public void quadroInCorrectOp4() {
246298LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
247299 .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
248300"0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
249- "" ,
250- "" )
301+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545 " ,
302+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545 " )
251303 .setOpTopic0_1 (LogOp .AND )
252304 .setOpTopic0_2 (LogOp .OR )
253305 .setOpTopic0_3 (LogOp .AND )
@@ -262,8 +314,8 @@ public void quadroInCorrectOp5() {
262314LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
263315 .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
264316"0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
265- "" ,
266- "" )
317+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545 " ,
318+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545 " )
267319 .setOpTopic0_1 (LogOp .AND )
268320 .setOpTopic0_2 (LogOp .OR )
269321 .setOpTopic0_3 (LogOp .AND )
@@ -278,8 +330,8 @@ public void quadroInCorrectOp6() {
278330LogQueryBuilder .with ("0x33990122638b9132ca29c723bdf037f1a891a70c" )
279331 .topic ("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545" ,
280332"0x72657075746174696f6e00000000000000000000000000000000000000000000" ,
281- "" ,
282- "" )
333+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545 " ,
334+ "0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545 " )
283335 .setOpTopic0_1 (LogOp .AND )
284336 .setOpTopic0_2 (LogOp .OR )
285337 .setOpTopic0_3 (LogOp .AND )