funk: fix return code in fd_funk_rec_remove

two-heart · topointon-jump · commit 62d844308a2b · 2025-05-02T15:03:27.000Z
the contract promises FD_FUNK_ERR_KEY in this case
diff --git a/src/funk/fd_funk_rec.c b/src/funk/fd_funk_rec.c
@@ -387,7 +387,7 @@ fd_funk_rec_remove( fd_funk_t *               funk,
   for(;;) {
     int err = fd_funk_rec_map_query_try( funk->rec_map, pair, NULL, query, 0 );
     if( err == FD_MAP_SUCCESS )   break;
-    if( err == FD_MAP_ERR_KEY )   return FD_FUNK_SUCCESS;
+    if( err == FD_MAP_ERR_KEY )   return FD_FUNK_ERR_KEY;
     if( err == FD_MAP_ERR_AGAIN ) continue;
     FD_LOG_CRIT(( "query returned err %d", err ));
   }
diff --git a/src/funk/fd_funk_rec.h b/src/funk/fd_funk_rec.h
@@ -269,7 +269,7 @@ fd_funk_rec_clone( fd_funk_t *               funk,
 
 /* fd_funk_rec_remove removes the live record with the
    given (xid,key) from funk. Returns FD_FUNK_SUCCESS (0) on
-   success and a FD_FUNK_ERR_* (negative) on failure.  Reasons for
+   success and an FD_FUNK_ERR_* (negative) on failure.  Reasons for
    failure include:
 
      FD_FUNK_ERR_INVAL - bad inputs (NULL funk, NULL xid)

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ fd_funk_rec_remove( fd_funk_t * funk,`
`387`	`387`	`for(;;) {`
`388`	`388`	`int err = fd_funk_rec_map_query_try( funk->rec_map, pair, NULL, query, 0 );`
`389`	`389`	`if( err == FD_MAP_SUCCESS ) break;`
`390`		`- if( err == FD_MAP_ERR_KEY ) return FD_FUNK_SUCCESS;`
	`390`	`+ if( err == FD_MAP_ERR_KEY ) return FD_FUNK_ERR_KEY;`
`391`	`391`	`if( err == FD_MAP_ERR_AGAIN ) continue;`
`392`	`392`	`FD_LOG_CRIT(( "query returned err %d", err ));`
`393`	`393`	`}`