@@ -190,6 +190,7 @@ public void testLogFilter() {
190190 } catch (JsonRpcInvalidParamsException e ) {
191191 Assert .fail ();
192192 }
193+
193194 try {
194195 new LogFilter (new FilterRequest (null , null , null , new String [] {"0x0" }, null ));
195196 } catch (JsonRpcInvalidParamsException e ) {
@@ -240,109 +241,6 @@ public void testLogFilter() {
240241 }
241242 }
242243
243- /**
244- * test fromBlock and toBlock parameters
245- */
246- @ Test
247- public void testLogFilterWrapper () {
248-
249- // fromBlock and toBlock are both empty
250- try {
251- LogFilterWrapper logFilterWrapper =
252- new LogFilterWrapper (new FilterRequest (null , null , null , null , null ), 100 , null );
253- Assert .assertEquals (logFilterWrapper .getFromBlock (), 100 );
254- Assert .assertEquals (logFilterWrapper .getToBlock (), Long .MAX_VALUE );
255- } catch (JsonRpcInvalidParamsException e ) {
256- Assert .fail ();
257- }
258-
259- // fromBlock is not empty and smaller than currentMaxBlockNum, toBlock is empty
260- try {
261- LogFilterWrapper logFilterWrapper =
262- new LogFilterWrapper (new FilterRequest ("0x14" , null , null , null , null ), 100 , null );
263- Assert .assertEquals (logFilterWrapper .getFromBlock (), 20 );
264- Assert .assertEquals (logFilterWrapper .getToBlock (), Long .MAX_VALUE );
265- } catch (JsonRpcInvalidParamsException e ) {
266- Assert .fail ();
267- }
268-
269- // fromBlock is not empty and bigger than currentMaxBlockNum, toBlock is empty
270- try {
271- LogFilterWrapper logFilterWrapper =
272- new LogFilterWrapper (new FilterRequest ("0x78" , null , null , null , null ), 100 , null );
273- Assert .assertEquals (logFilterWrapper .getFromBlock (), 120 );
274- Assert .assertEquals (logFilterWrapper .getToBlock (), Long .MAX_VALUE );
275- } catch (JsonRpcInvalidParamsException e ) {
276- Assert .fail ();
277- }
278-
279- // fromBlock is empty, toBlock is not empty and smaller than currentMaxBlockNum
280- try {
281- LogFilterWrapper logFilterWrapper =
282- new LogFilterWrapper (new FilterRequest (null , "0x14" , null , null , null ), 100 , null );
283- Assert .assertEquals (logFilterWrapper .getFromBlock (), 20 );
284- Assert .assertEquals (logFilterWrapper .getToBlock (), 20 );
285- } catch (JsonRpcInvalidParamsException e ) {
286- Assert .fail ();
287- }
288-
289- // fromBlock is empty, toBlock is not empty and bigger than currentMaxBlockNum
290- try {
291- LogFilterWrapper logFilterWrapper =
292- new LogFilterWrapper (new FilterRequest (null , "0x78" , null , null , null ), 100 , null );
293- Assert .assertEquals (logFilterWrapper .getFromBlock (), 100 );
294- Assert .assertEquals (logFilterWrapper .getToBlock (), 120 );
295- } catch (JsonRpcInvalidParamsException e ) {
296- Assert .fail ();
297- }
298-
299- // fromBlock is not empty, toBlock is not empty
300- try {
301- LogFilterWrapper logFilterWrapper =
302- new LogFilterWrapper (new FilterRequest ("0x14" , "0x78" , null , null , null ), 100 , null );
303- Assert .assertEquals (logFilterWrapper .getFromBlock (), 20 );
304- Assert .assertEquals (logFilterWrapper .getToBlock (), 120 );
305- } catch (JsonRpcInvalidParamsException e ) {
306- Assert .fail ();
307- }
308- try {
309- LogFilterWrapper logFilterWrapper =
310- new LogFilterWrapper (new FilterRequest ("0x78" , "0x14" , null , null , null ), 100 , null );
311- } catch (JsonRpcInvalidParamsException e ) {
312- Assert .assertEquals ("please verify: fromBlock <= toBlock" , e .getMessage ());
313- }
314-
315- //fromBlock or toBlock is not hex num
316- try {
317- LogFilterWrapper logFilterWrapper =
318- new LogFilterWrapper (new FilterRequest ("earliest" , null , null , null , null ), 100 , null );
319- Assert .assertEquals (logFilterWrapper .getFromBlock (), 0 );
320- Assert .assertEquals (logFilterWrapper .getToBlock (), Long .MAX_VALUE );
321- } catch (JsonRpcInvalidParamsException e ) {
322- Assert .fail ();
323- }
324- try {
325- LogFilterWrapper logFilterWrapper =
326- new LogFilterWrapper (new FilterRequest ("latest" , null , null , null , null ), 100 , null );
327- Assert .assertEquals (logFilterWrapper .getFromBlock (), 100 );
328- Assert .assertEquals (logFilterWrapper .getToBlock (), Long .MAX_VALUE );
329- } catch (JsonRpcInvalidParamsException e ) {
330- Assert .fail ();
331- }
332- try {
333- LogFilterWrapper logFilterWrapper =
334- new LogFilterWrapper (new FilterRequest ("pending" , null , null , null , null ), 100 , null );
335- } catch (JsonRpcInvalidParamsException e ) {
336- Assert .assertEquals ("TAG pending not supported" , e .getMessage ());
337- }
338- try {
339- LogFilterWrapper logFilterWrapper =
340- new LogFilterWrapper (new FilterRequest ("test" , null , null , null , null ), 100 , null );
341- } catch (JsonRpcInvalidParamsException e ) {
342- Assert .assertEquals ("Incorrect hex syntax" , e .getMessage ());
343- }
344- }
345-
346244 private int [] getBloomIndex (String s ) {
347245 Bloom bloom = Bloom .create (Hash .sha3 (ByteArray .fromHexString (s )));
348246 BitSet bs = BitSet .valueOf (bloom .getData ());
0 commit comments