@@ -1075,7 +1075,7 @@ mod tests {
10751075 }
10761076 }
10771077
1078- macro_rules! assert_next_range {
1078+ macro_rules! assert_next {
10791079 ( $recv: expr, None ) => {
10801080 let next = $recv. next_range( ) . await ;
10811081 assert!( next. is_none( ) ) ;
@@ -1668,8 +1668,8 @@ mod tests {
16681668 service. stream_rewind ( 100 ..=150 ) . await ;
16691669 service. handle_unsubscribe ( ) ;
16701670
1671- assert_next_range ! ( rx, 100 ..=150 ) ;
1672- assert_next_range ! ( rx, None ) ;
1671+ assert_next ! ( rx, 100 ..=150 ) ;
1672+ assert_next ! ( rx, None ) ;
16731673
16741674 Ok ( ( ) )
16751675 }
@@ -1691,10 +1691,10 @@ mod tests {
16911691 service. stream_rewind ( 0 ..=14 ) . await ;
16921692 service. handle_unsubscribe ( ) ;
16931693
1694- assert_next_range ! ( rx, 10 ..=14 ) ;
1695- assert_next_range ! ( rx, 5 ..=9 ) ;
1696- assert_next_range ! ( rx, 0 ..=4 ) ;
1697- assert_next_range ! ( rx, None ) ;
1694+ assert_next ! ( rx, 10 ..=14 ) ;
1695+ assert_next ! ( rx, 5 ..=9 ) ;
1696+ assert_next ! ( rx, 0 ..=4 ) ;
1697+ assert_next ! ( rx, None ) ;
16981698
16991699 Ok ( ( ) )
17001700 }
@@ -1715,10 +1715,10 @@ mod tests {
17151715 service. stream_rewind ( 3 ..=12 ) . await ;
17161716 service. handle_unsubscribe ( ) ;
17171717
1718- assert_next_range ! ( rx, 9 ..=12 ) ;
1719- assert_next_range ! ( rx, 5 ..=8 ) ;
1720- assert_next_range ! ( rx, 3 ..=4 ) ;
1721- assert_next_range ! ( rx, None ) ;
1718+ assert_next ! ( rx, 9 ..=12 ) ;
1719+ assert_next ! ( rx, 5 ..=8 ) ;
1720+ assert_next ! ( rx, 3 ..=4 ) ;
1721+ assert_next ! ( rx, None ) ;
17221722
17231723 Ok ( ( ) )
17241724 }
@@ -1738,8 +1738,8 @@ mod tests {
17381738 service. stream_rewind ( 7 ..=7 ) . await ;
17391739 service. handle_unsubscribe ( ) ;
17401740
1741- assert_next_range ! ( rx, 7 ..=7 ) ;
1742- assert_next_range ! ( rx, None ) ;
1741+ assert_next ! ( rx, 7 ..=7 ) ;
1742+ assert_next ! ( rx, None ) ;
17431743
17441744 Ok ( ( ) )
17451745 }
@@ -1760,11 +1760,11 @@ mod tests {
17601760 service. stream_rewind ( 5 ..=8 ) . await ;
17611761 service. handle_unsubscribe ( ) ;
17621762
1763- assert_next_range ! ( rx, 8 ..=8 ) ;
1764- assert_next_range ! ( rx, 7 ..=7 ) ;
1765- assert_next_range ! ( rx, 6 ..=6 ) ;
1766- assert_next_range ! ( rx, 5 ..=5 ) ;
1767- assert_next_range ! ( rx, None ) ;
1763+ assert_next ! ( rx, 8 ..=8 ) ;
1764+ assert_next ! ( rx, 7 ..=7 ) ;
1765+ assert_next ! ( rx, 6 ..=6 ) ;
1766+ assert_next ! ( rx, 5 ..=5 ) ;
1767+ assert_next ! ( rx, None ) ;
17681768
17691769 Ok ( ( ) )
17701770 }
@@ -1787,10 +1787,10 @@ mod tests {
17871787 . rewind :: < BlockNumberOrTag > ( BlockNumberOrTag :: Earliest , BlockNumberOrTag :: Latest )
17881788 . await ?;
17891789
1790- assert_next_range ! ( stream, 14 ..=20 ) ;
1791- assert_next_range ! ( stream, 7 ..=13 ) ;
1792- assert_next_range ! ( stream, 0 ..=6 ) ;
1793- assert_next_range ! ( stream, None ) ;
1790+ assert_next ! ( stream, 14 ..=20 ) ;
1791+ assert_next ! ( stream, 7 ..=13 ) ;
1792+ assert_next ! ( stream, 0 ..=6 ) ;
1793+ assert_next ! ( stream, None ) ;
17941794
17951795 Ok ( ( ) )
17961796 }
@@ -1811,17 +1811,17 @@ mod tests {
18111811
18121812 let mut stream = client. rewind ( 15 , 3 ) . await ?;
18131813
1814- assert_next_range ! ( stream, 11 ..=15 ) ;
1815- assert_next_range ! ( stream, 6 ..=10 ) ;
1816- assert_next_range ! ( stream, 3 ..=5 ) ;
1817- assert_next_range ! ( stream, None ) ;
1814+ assert_next ! ( stream, 11 ..=15 ) ;
1815+ assert_next ! ( stream, 6 ..=10 ) ;
1816+ assert_next ! ( stream, 3 ..=5 ) ;
1817+ assert_next ! ( stream, None ) ;
18181818
18191819 let mut stream = client. rewind ( 3 , 15 ) . await ?;
18201820
1821- assert_next_range ! ( stream, 11 ..=15 ) ;
1822- assert_next_range ! ( stream, 6 ..=10 ) ;
1823- assert_next_range ! ( stream, 3 ..=5 ) ;
1824- assert_next_range ! ( stream, None ) ;
1821+ assert_next ! ( stream, 11 ..=15 ) ;
1822+ assert_next ! ( stream, 6 ..=10 ) ;
1823+ assert_next ! ( stream, 3 ..=5 ) ;
1824+ assert_next ! ( stream, None ) ;
18251825
18261826 Ok ( ( ) )
18271827 }
0 commit comments