@@ -377,7 +377,7 @@ fn test_release_without_approval_fails() {
377377}
378378
379379#[ test]
380- #[ should_panic( expected = "HostError: Error(Contract, #10 )" ) ]
380+ #[ should_panic( expected = "HostError: Error(Contract, #6 )" ) ]
381381fn test_double_client_approval_fails ( ) {
382382 let setup = setup_test ( ) ;
383383 let escrow = setup. escrow_client ;
@@ -398,7 +398,7 @@ fn test_double_client_approval_fails() {
398398 escrow. fund ( ) ;
399399 escrow. submit_milestone ( & 1 ) ;
400400 escrow. approve ( & 1 ) ;
401- // Double approval should fail with AlreadyApproved (error code 10)
401+ // Once approved, the milestone is no longer in Submitted state.
402402 escrow. approve ( & 1 ) ;
403403}
404404
@@ -531,7 +531,7 @@ fn test_dispute_after_release_fails() {
531531 let setup = setup_test ( ) ;
532532 initialize_single_milestone ( & setup, 150 ) ;
533533 fully_approve_single_milestone ( & setup) ;
534- setup. escrow_client . release ( & 1 , & setup. freelancer ) ;
534+ setup. escrow_client . release ( & 1 , & setup. client ) ;
535535
536536 setup. escrow_client . dispute ( & 1 , & setup. client ) ;
537537}
@@ -542,7 +542,7 @@ fn test_refund_after_release_fails() {
542542 let setup = setup_test ( ) ;
543543 initialize_single_milestone ( & setup, 150 ) ;
544544 fully_approve_single_milestone ( & setup) ;
545- setup. escrow_client . release ( & 1 , & setup. freelancer ) ;
545+ setup. escrow_client . release ( & 1 , & setup. client ) ;
546546
547547 setup. escrow_client . refund ( & 1 , & setup. freelancer ) ;
548548}
@@ -551,23 +551,22 @@ fn test_refund_after_release_fails() {
551551fn test_successful_security_events_are_emitted ( ) {
552552 let setup = setup_test ( ) ;
553553 let env = setup. env . clone ( ) ;
554- let initial_event_count = env. events ( ) . all ( ) . events ( ) . len ( ) ;
555554
556555 initialize_single_milestone ( & setup, 150 ) ;
557- assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , initial_event_count + 1 ) ;
556+ assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , 1 ) ;
558557
559558 setup. escrow_client . fund ( ) ;
560- assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , initial_event_count + 2 ) ;
559+ assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , 1 ) ;
561560
562561 setup. escrow_client . submit_milestone ( & 1 ) ;
563- assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , initial_event_count + 3 ) ;
562+ assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , 1 ) ;
564563
565564 setup. escrow_client . approve ( & 1 ) ;
566- assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , initial_event_count + 4 ) ;
565+ assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , 1 ) ;
567566
568567 setup. escrow_client . freelancer_confirm ( & 1 ) ;
569- assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , initial_event_count + 5 ) ;
568+ assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , 1 ) ;
570569
571570 setup. escrow_client . release ( & 1 , & setup. client ) ;
572- assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , initial_event_count + 6 ) ;
571+ assert_eq ! ( env. events( ) . all( ) . events( ) . len( ) , 1 ) ;
573572}
0 commit comments