diff --git a/Cargo.lock b/Cargo.lock index 53304306..b5821e09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -653,7 +653,7 @@ dependencies = [ [[package]] name = "auction-server" -version = "0.35.2" +version = "0.36.0" dependencies = [ "anchor-lang", "anchor-lang-idl", diff --git a/auction-server/Cargo.toml b/auction-server/Cargo.toml index 39e49a98..f0c1c989 100644 --- a/auction-server/Cargo.toml +++ b/auction-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "auction-server" -version = "0.35.2" +version = "0.36.0" edition = "2021" license-file = "license.txt" diff --git a/auction-server/src/config.rs b/auction-server/src/config.rs index 80d63164..70475c70 100644 --- a/auction-server/src/config.rs +++ b/auction-server/src/config.rs @@ -102,12 +102,6 @@ pub struct DeletePgRowsOptions { #[arg(env = "DELETE_THRESHOLD_SECONDS")] #[arg(default_value = "172800")] // 2 days in seconds pub delete_threshold_secs: u64, - - /// The buffer time to account for bids that may still exist in the db. We cannot delete auctions with ids that are still referenced by bids, so we wait an additional buffer time before deleting auctions. - #[arg(long = "delete-buffer-auction-seconds")] - #[arg(env = "DELETE_BUFFER_AUCTION_SECONDS")] - #[arg(default_value = "3600")] // 1 hour in seconds - pub delete_buffer_auction_secs: u64, } #[derive(Args, Clone, Debug)] diff --git a/auction-server/src/kernel/workers.rs b/auction-server/src/kernel/workers.rs index 57efbc91..429516e7 100644 --- a/auction-server/src/kernel/workers.rs +++ b/auction-server/src/kernel/workers.rs @@ -125,7 +125,7 @@ pub async fn run_delete_pg_db_history( delete_pg_db_auction_history( db, - delete_threshold_secs + delete_pg_rows_options.delete_buffer_auction_secs, + delete_threshold_secs, ) .await?; } diff --git a/integration.py b/integration.py index b6e7a745..821c6897 100644 --- a/integration.py +++ b/integration.py @@ -16,7 +16,6 @@ def main(): f.write(f'export DELETE_ENABLED=true\n') f.write(f'export DELETE_INTERVAL_SECONDS={1}\n') f.write(f'export DELETE_THRESHOLD_SECONDS={60*60*24*2}\n') - f.write(f'export DELETE_BUFFER_AUCTION_SECONDS={60*60}\n') mint_buy = Keypair.from_json((open('keypairs/mint_buy.json').read())).pubkey() mint_sell = Keypair.from_json((open('keypairs/mint_sell.json').read())).pubkey()