From 86fed1a90ce4f62d108dfa0559525895018d0bb4 Mon Sep 17 00:00:00 2001
From: "sinu.eth" <65924192+sinui0@users.noreply.github.com>
Date: Fri, 18 Apr 2025 13:01:28 +0700
Subject: [PATCH] refactor: remove extension api from request builder (#787)

---
 crates/core/src/fixtures.rs        | 13 ++++++++-----
 crates/core/src/request/builder.rs | 12 ++----------
 crates/prover/src/notarize.rs      |  4 ----
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/crates/core/src/fixtures.rs b/crates/core/src/fixtures.rs
index 6f4b743b9..a8c0178c9 100644
--- a/crates/core/src/fixtures.rs
+++ b/crates/core/src/fixtures.rs
@@ -199,7 +199,14 @@ pub fn request_fixture(
     )
     .unwrap();
 
-    let request_config = RequestConfig::default();
+    let mut builder = RequestConfig::builder();
+
+    for extension in extensions {
+        builder.extension(extension);
+    }
+
+    let request_config = builder.build().unwrap();
+
     let mut request_builder = Request::builder(&request_config);
     request_builder
         .server_name(server_name)
@@ -207,10 +214,6 @@ pub fn request_fixture(
         .transcript(transcript)
         .encoding_tree(encoding_tree.clone());
 
-    for extension in extensions {
-        request_builder.extension(extension);
-    }
-
     let (request, _) = request_builder.build(&provider).unwrap();
 
     RequestFixture {
diff --git a/crates/core/src/request/builder.rs b/crates/core/src/request/builder.rs
index 94048e829..0dd4e5dea 100644
--- a/crates/core/src/request/builder.rs
+++ b/crates/core/src/request/builder.rs
@@ -1,5 +1,4 @@
 use crate::{
-    attestation::Extension,
     connection::{ServerCertData, ServerCertOpening, ServerName},
     index::Index,
     request::{Request, RequestConfig},
@@ -15,7 +14,6 @@ pub struct RequestBuilder<'a> {
     server_cert_data: Option<ServerCertData>,
     encoding_tree: Option<EncodingTree>,
     transcript: Option<Transcript>,
-    extensions: Vec<Extension>,
 }
 
 impl<'a> RequestBuilder<'a> {
@@ -27,7 +25,6 @@ impl<'a> RequestBuilder<'a> {
             server_cert_data: None,
             encoding_tree: None,
             transcript: None,
-            extensions: Vec::new(),
         }
     }
 
@@ -55,12 +52,6 @@ impl<'a> RequestBuilder<'a> {
         self
     }
 
-    /// Adds an extension to the request.
-    pub fn extension(&mut self, extension: Extension) -> &mut Self {
-        self.extensions.push(extension);
-        self
-    }
-
     /// Builds the attestation request and returns the corresponding secrets.
     pub fn build(
         self,
@@ -72,7 +63,6 @@ impl<'a> RequestBuilder<'a> {
             server_cert_data,
             encoding_tree,
             transcript,
-            extensions,
         } = self;
 
         let signature_alg = *config.signature_alg();
@@ -97,6 +87,8 @@ impl<'a> RequestBuilder<'a> {
 
         let encoding_commitment_root = encoding_tree.as_ref().map(|tree| tree.root());
 
+        let extensions = config.extensions().to_vec();
+
         let request = Request {
             signature_alg,
             hash_alg,
diff --git a/crates/prover/src/notarize.rs b/crates/prover/src/notarize.rs
index 3255c7389..da03ccb3e 100644
--- a/crates/prover/src/notarize.rs
+++ b/crates/prover/src/notarize.rs
@@ -87,10 +87,6 @@ impl Prover<Notarize> {
             }
         }
 
-        for extension in config.extensions() {
-            builder.extension(extension.clone());
-        }
-
         let (request, secrets) = builder.build(provider).map_err(ProverError::attestation)?;
 
         let attestation = mux_fut