fix: conflict handler after testing

Signed-off-by: Norman Meier <[email protected]>
TERITORI · Feb 14, 2024 · 39b0e81 · 39b0e81
1 parent c6bc1a1
commit 39b0e81
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/examples/gno.land/r/demo/teritori/escrow/escrow.gno b/examples/gno.land/r/demo/teritori/escrow/escrow.gno
@@ -822,19 +822,20 @@ func RespondToConflict(contractId uint64, message string) {
 	conflict := contract.conflicts[conflictId]
 
 	if conflict.initiator == contract.funder {
-		if contract.funder != caller.String() {
+		if contract.contractor != caller.String() {
 			panic("only contract funder can respond to this conflict")
 		}
 	} else if conflict.initiator == contract.contractor {
-		if contract.contractor != caller.String() {
+		if contract.funder != caller.String() {
 			panic("only contract contractor can respond to this conflict")
 		}
 	} else {
 		panic("conflict initiator is not valid")
 	}
 
 	contracts[contractId].conflicts[conflictId].responseMessage = &message
-	contracts[contractId].conflicts[conflictId].respondedAt = &time.Now()
+	now := time.Now()
+	contracts[contractId].conflicts[conflictId].respondedAt = &now
 }
 
 func ResolveConflict(contractId uint64, outcome ConflictOutcome, resolutionMessage string) {
@@ -890,7 +891,8 @@ func ResolveConflict(contractId uint64, outcome ConflictOutcome, resolutionMessa
 
 	contracts[contractId].conflicts[conflictId].resolutionMessage = &resolutionMessage
 	contracts[contractId].conflicts[conflictId].outcome = &outcome
-	contracts[contractId].conflicts[conflictId].resolvedAt = &time.Now()
+	now := time.Now()
+	contracts[contractId].conflicts[conflictId].resolvedAt = &now
 }
 
 func CompleteContractByConflictHandler(contractId uint64, milestoneId uint64, contractorAmount uint64) {