@@ -733,7 +733,8 @@ mod test {
733
733
use super :: * ;
734
734
use crate :: {
735
735
db:: {
736
- insert_campaign, insert_channel, validator_message:: { insert_validator_message, get_validator_messages} ,
736
+ insert_campaign, insert_channel,
737
+ validator_message:: { get_validator_messages, insert_validator_message} ,
737
738
CampaignRemaining ,
738
739
} ,
739
740
routes:: channel:: validator_message:: create_validator_messages,
@@ -744,20 +745,20 @@ mod test {
744
745
prelude:: Unlocked ,
745
746
primitives:: Deposit as AdapterDeposit ,
746
747
} ;
748
+ use chrono:: Utc ;
747
749
use primitives:: {
748
750
balances:: UncheckedState ,
749
751
channel:: Nonce ,
750
752
config:: GANACHE_CONFIG ,
753
+ sentry:: validator_messages:: ValidatorMessagesCreateRequest ,
751
754
test_util:: {
752
755
ADVERTISER , CREATOR , DUMMY_CAMPAIGN , FOLLOWER , GUARDIAN , IDS , LEADER , LEADER_2 ,
753
- PUBLISHER , PUBLISHER_2
756
+ PUBLISHER , PUBLISHER_2 ,
754
757
} ,
755
- sentry:: validator_messages:: ValidatorMessagesCreateRequest ,
756
- validator:: { ApproveState , MessageTypes , NewState , MessageType , Heartbeat , RejectState } ,
758
+ validator:: { ApproveState , Heartbeat , MessageType , MessageTypes , NewState , RejectState } ,
757
759
BigNum , ChainId , Deposit , UnifiedMap , ValidatorId ,
758
760
} ;
759
761
use std:: str:: FromStr ;
760
- use chrono:: Utc ;
761
762
762
763
#[ tokio:: test]
763
764
async fn create_and_fetch_spendable ( ) {
@@ -1580,7 +1581,12 @@ mod test {
1580
1581
let app_guard = setup_dummy_app ( ) . await ;
1581
1582
let app = Extension ( Arc :: new ( app_guard. app . clone ( ) ) ) ;
1582
1583
let config = GANACHE_CONFIG . clone ( ) ;
1583
- let all_message_types: [ MessageType ; 4 ] = [ MessageType :: NewState , MessageType :: ApproveState , MessageType :: RejectState , MessageType :: Heartbeat ] ;
1584
+ let all_message_types: [ MessageType ; 4 ] = [
1585
+ MessageType :: NewState ,
1586
+ MessageType :: ApproveState ,
1587
+ MessageType :: RejectState ,
1588
+ MessageType :: Heartbeat ,
1589
+ ] ;
1584
1590
1585
1591
let channel_context = Extension (
1586
1592
app. config
@@ -1604,11 +1610,15 @@ mod test {
1604
1610
chain : chain_context. chain . clone ( ) ,
1605
1611
} ;
1606
1612
1607
- let req = ValidatorMessagesCreateRequest {
1608
- messages : vec ! [ ] ,
1609
- } ;
1613
+ let req = ValidatorMessagesCreateRequest { messages : vec ! [ ] } ;
1610
1614
1611
- let res = create_validator_messages ( app. clone ( ) , Extension ( auth) , channel_context. clone ( ) , Json ( req) ) . await ;
1615
+ let res = create_validator_messages (
1616
+ app. clone ( ) ,
1617
+ Extension ( auth) ,
1618
+ channel_context. clone ( ) ,
1619
+ Json ( req) ,
1620
+ )
1621
+ . await ;
1612
1622
1613
1623
assert ! ( matches!( res, Err ( ResponseError :: Unauthorized ) ) ) ;
1614
1624
}
@@ -1621,13 +1631,26 @@ mod test {
1621
1631
chain : chain_context. chain . clone ( ) ,
1622
1632
} ;
1623
1633
1624
- let req = ValidatorMessagesCreateRequest {
1625
- messages : vec ! [ ] ,
1626
- } ;
1627
-
1628
- create_validator_messages ( app. clone ( ) , Extension ( auth) , channel_context. clone ( ) , Json ( req) ) . await . expect ( "should work" ) ;
1634
+ let req = ValidatorMessagesCreateRequest { messages : vec ! [ ] } ;
1629
1635
1630
- let messages = get_validator_messages ( & app. pool , & channel_context. context . id ( ) , & Some ( IDS [ & LEADER ] ) , & all_message_types, 100 ) . await . expect ( "should get messages" ) ;
1636
+ create_validator_messages (
1637
+ app. clone ( ) ,
1638
+ Extension ( auth) ,
1639
+ channel_context. clone ( ) ,
1640
+ Json ( req) ,
1641
+ )
1642
+ . await
1643
+ . expect ( "should work" ) ;
1644
+
1645
+ let messages = get_validator_messages (
1646
+ & app. pool ,
1647
+ & channel_context. context . id ( ) ,
1648
+ & Some ( IDS [ & LEADER ] ) ,
1649
+ & all_message_types,
1650
+ 100 ,
1651
+ )
1652
+ . await
1653
+ . expect ( "should get messages" ) ;
1631
1654
1632
1655
assert_eq ! ( messages. len( ) , 0 ) ;
1633
1656
}
@@ -1649,10 +1672,26 @@ mod test {
1649
1672
messages : vec ! [ MessageTypes :: Heartbeat ( message. clone( ) ) ] ,
1650
1673
} ;
1651
1674
1652
- create_validator_messages ( app. clone ( ) , Extension ( auth) , channel_context. clone ( ) , Json ( req) ) . await . expect ( "Should create messages" ) ;
1653
-
1654
- let messages = get_validator_messages ( & app. pool , & channel_context. context . id ( ) , & Some ( IDS [ & LEADER ] ) , & all_message_types, 100 ) . await . expect ( "should get messages" ) ;
1655
- let inner_messages: Vec < MessageTypes > = messages. into_iter ( ) . map ( |m| m. msg . clone ( ) ) . collect ( ) ;
1675
+ create_validator_messages (
1676
+ app. clone ( ) ,
1677
+ Extension ( auth) ,
1678
+ channel_context. clone ( ) ,
1679
+ Json ( req) ,
1680
+ )
1681
+ . await
1682
+ . expect ( "Should create messages" ) ;
1683
+
1684
+ let messages = get_validator_messages (
1685
+ & app. pool ,
1686
+ & channel_context. context . id ( ) ,
1687
+ & Some ( IDS [ & LEADER ] ) ,
1688
+ & all_message_types,
1689
+ 100 ,
1690
+ )
1691
+ . await
1692
+ . expect ( "should get messages" ) ;
1693
+ let inner_messages: Vec < MessageTypes > =
1694
+ messages. into_iter ( ) . map ( |m| m. msg . clone ( ) ) . collect ( ) ;
1656
1695
assert_eq ! ( inner_messages, vec![ MessageTypes :: Heartbeat ( message) ] ) ;
1657
1696
}
1658
1697
// Case with 4 messages (one of each type, heartbeat is already inserted)
@@ -1693,12 +1732,31 @@ mod test {
1693
1732
} ;
1694
1733
1695
1734
let req = ValidatorMessagesCreateRequest {
1696
- messages : vec ! [ MessageTypes :: NewState ( new_state. clone( ) ) , MessageTypes :: ApproveState ( approve_state. clone( ) ) , MessageTypes :: RejectState ( reject_state. clone( ) ) ] ,
1735
+ messages : vec ! [
1736
+ MessageTypes :: NewState ( new_state. clone( ) ) ,
1737
+ MessageTypes :: ApproveState ( approve_state. clone( ) ) ,
1738
+ MessageTypes :: RejectState ( reject_state. clone( ) ) ,
1739
+ ] ,
1697
1740
} ;
1698
1741
1699
- create_validator_messages ( app. clone ( ) , Extension ( auth) , channel_context. clone ( ) , Json ( req) ) . await . expect ( "Should create messages" ) ;
1700
-
1701
- let messages = get_validator_messages ( & app. pool , & channel_context. context . id ( ) , & Some ( IDS [ & LEADER ] ) , & all_message_types, 100 ) . await . expect ( "should get messages" ) ;
1742
+ create_validator_messages (
1743
+ app. clone ( ) ,
1744
+ Extension ( auth) ,
1745
+ channel_context. clone ( ) ,
1746
+ Json ( req) ,
1747
+ )
1748
+ . await
1749
+ . expect ( "Should create messages" ) ;
1750
+
1751
+ let messages = get_validator_messages (
1752
+ & app. pool ,
1753
+ & channel_context. context . id ( ) ,
1754
+ & Some ( IDS [ & LEADER ] ) ,
1755
+ & all_message_types,
1756
+ 100 ,
1757
+ )
1758
+ . await
1759
+ . expect ( "should get messages" ) ;
1702
1760
assert_eq ! ( messages. len( ) , 4 ) ;
1703
1761
}
1704
1762
}
0 commit comments