feat: Change fields in create deposit request object to be consistent…

… with other objects.
stacks-network · Oct 2, 2024 · 990fb13 · 990fb13
1 parent ebefcce
commit 990fb13
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.generated-sources/emily/openapi/emily-openapi-spec.json b/.generated-sources/emily/openapi/emily-openapi-spec.json
@@ -1203,8 +1203,8 @@
         "required": [
           "bitcoinTxid",
           "bitcoinTxOutputIndex",
-          "reclaim",
-          "deposit"
+          "reclaimScript",
+          "depositScript"
         ],
         "properties": {
           "bitcoinTxOutputIndex": {
@@ -1217,11 +1217,11 @@
             "type": "string",
             "description": "Bitcoin transaction id."
           },
-          "deposit": {
+          "depositScript": {
             "type": "string",
             "description": "Deposit script."
           },
-          "reclaim": {
+          "reclaimScript": {
             "type": "string",
             "description": "Reclaim script."
           }

diff --git a/emily/handler/src/api/handlers/deposit.rs b/emily/handler/src/api/handlers/deposit.rs
@@ -226,8 +226,8 @@ pub async fn create_deposit(
             status,
             last_update_block_hash: stacks_block_hash,
             last_update_height: stacks_block_height,
-            reclaim_script: body.reclaim,
-            deposit_script: body.deposit,
+            reclaim_script: body.reclaim_script,
+            deposit_script: body.deposit_script,
             ..Default::default()
         };
         // Validate deposit entry.

diff --git a/emily/handler/src/api/models/deposit/requests.rs b/emily/handler/src/api/models/deposit/requests.rs
@@ -40,9 +40,9 @@ pub struct CreateDepositRequestBody {
     /// Output index on the bitcoin transaction associated with this specific deposit.
     pub bitcoin_tx_output_index: u32,
     /// Reclaim script.
-    pub reclaim: String,
+    pub reclaim_script: String,
     /// Deposit script.
-    pub deposit: String,
+    pub deposit_script: String,
 }
 
 /// A singlular Deposit update that contains only the fields pertinent

diff --git a/emily/handler/tests/integration/complex/reorg.rs b/emily/handler/tests/integration/complex/reorg.rs
@@ -113,8 +113,8 @@ async fn simple_reorg_test_base(scenario: ReorgScenario) {
         let deposit_request = CreateDepositRequestBody {
             bitcoin_txid: format!("{TEST_BITCOIN_TXID}-{stacks_block_height}"),
             bitcoin_tx_output_index: 1,
-            reclaim: TEST_RECLAIM_SCRIPT.to_string(),
-            deposit: TEST_DEPOSIT_SCRIPT.to_string(),
+            reclaim_script: TEST_RECLAIM_SCRIPT.to_string(),
+            deposit_script: TEST_DEPOSIT_SCRIPT.to_string(),
         };
         let withdrawal_request = CreateWithdrawalRequestBody {
             request_id: stacks_block_height,

diff --git a/emily/handler/tests/integration/endpoints/deposit.rs b/emily/handler/tests/integration/endpoints/deposit.rs
@@ -80,8 +80,8 @@ async fn setup_deposit_integration_test() -> TestClient {
         let request: CreateDepositRequestBody = serde_json::from_value(json!({
             "bitcoinTxid": bitcoin_txid.clone(),
             "bitcoinTxOutputIndex": bitcoin_tx_output_index,
-            "reclaim": TEST_RECLAIM_SCRIPT.to_string(),
-            "deposit": TEST_DEPOSIT_SCRIPT.to_string(),
+            "reclaimScript": TEST_RECLAIM_SCRIPT.to_string(),
+            "depositScript": TEST_DEPOSIT_SCRIPT.to_string(),
         }))
         .expect("Failed to deserialize create deposit request body in test setup");
         let response = client.create_deposit(&request).await;

diff --git a/emily/handler/tests/integration/populate/mod.rs b/emily/handler/tests/integration/populate/mod.rs
@@ -35,8 +35,8 @@ async fn create_deposits(client: &TestClient) {
             let create_request = CreateDepositRequestBody {
                 bitcoin_txid: format!("txid-{i}"),
                 bitcoin_tx_output_index: j + offset,
-                reclaim: format!("reclaim-script-{i}"),
-                deposit: format!("deposit-script-{i}"),
+                reclaim_script: format!("reclaim-script-{i}"),
+                deposit_script: format!("deposit-script-{i}"),
             };
             client.create_deposit(&create_request).await;
         }

diff --git a/emily/handler/tests/integration/util/mod.rs b/emily/handler/tests/integration/util/mod.rs
@@ -63,8 +63,8 @@ pub fn test_create_deposit_request(id_num: u64, output_index: u32) -> CreateDepo
     CreateDepositRequestBody {
         bitcoin_txid: format!("deposit-txid-{id_num}"),
         bitcoin_tx_output_index: output_index,
-        reclaim: format!("deposit-txid-{id_num}:{output_index}-reclaim-script"),
-        deposit: format!("deposit-txid-{id_num}:{output_index}-deposit-script"),
+        reclaim_script: format!("deposit-txid-{id_num}:{output_index}-reclaim-script"),
+        deposit_script: format!("deposit-txid-{id_num}:{output_index}-deposit-script"),
     }
 }