submitRaaS param changes

contracts/DealStatus.sol

@@ -29,12 +29,11 @@ contract DealStatus is IAggregatorOracle, Proof {
         return transactionId;
     }
 
-    function submit_raas(
+    function submitRaaS(
         bytes memory _cid,
-        uint replication_num_copies,
-        uint repair_threshold,
-        uint renewal_threshold,
-        string[] memory miner
+		uint256 _replication_target,
+        uint256 _repair_threshold,
+		uint256 _renew_threshold
     ) external returns (uint256) {
         // Increment the transaction ID
         transactionId++;
@@ -43,7 +42,7 @@ contract DealStatus is IAggregatorOracle, Proof {
         txIdToCid[transactionId] = _cid;
 
         // Emit the event
-        emit SubmitAggregatorRequestRaaS(transactionId, _cid, replication_num_copies, repair_threshold, renewal_threshold, miner);
+        emit SubmitAggregatorRequestWithRaaS(transactionId, _cid, _replication_target, _repair_threshold, _renew_threshold);
         return transactionId;
     }
 

contracts/interfaces/IAggregatorOracle.sol

@@ -22,22 +22,25 @@ interface IAggregatorOracle {
     // Emitted when a new request is submitted with an ID and content identifier (CID).
     event SubmitAggregatorRequest(uint256 indexed id, bytes cid);
 
-    // Emitted when a new request is submitted with an ID, content identifier (CID) and other deal parameters.
-    event SubmitAggregatorRequestRaaS(
-        uint256 indexed id,
-        bytes cid,
-        uint replication_num_copies,
-        uint repair_threshold,
-        uint renewal_threshold,
-        string[] miner
-    );
+    // Emitted when a new request is submitted with an ID, content identifier (CID), and RaaS parameters
+    event SubmitAggregatorRequestWithRaaS(uint256 indexed id, bytes cid,
+										  uint256 _replication_target, uint256 _repair_threshold,
+										  uint256 _renew_threshold);
 
     // Emitted when a request is completed, providing the request ID and deal ID.
     event CompleteAggregatorRequest(uint256 indexed id, uint64 indexed dealId);
 
     // Function that submits a new request to the oracle
     function submit(bytes memory _cid) external returns (uint256);
 
+    // Function to submit a new file to the aggregator, specifing the raas parameters
+	function submitRaaS(
+        bytes memory _cid,
+		uint256 _replication_target,
+        uint256 _repair_threshold,
+		uint256 _renew_threshold
+    ) external returns (uint256);
+
     // Callback function that is called by the aggregator
     function complete(
         uint256 _id,

contracts/mocks/DealStatusMock.sol

@@ -32,12 +32,11 @@ contract DealStatusMock is IAggregatorOracle, ProofMock {
         return transactionId;
     }
 
-    function submit_raas(
+    function submitRaaS(
         bytes memory _cid,
-        uint replication_num_copies,
-        uint repair_threshold,
-        uint renewal_threshold,
-        string[] memory miner
+		uint256 _replication_target,
+        uint256 _repair_threshold,
+		uint256 _renew_threshold
     ) external returns (uint256) {
         // Increment the transaction ID
         transactionId++;
@@ -46,7 +45,7 @@ contract DealStatusMock is IAggregatorOracle, ProofMock {
         txIdToCid[transactionId] = _cid;
 
         // Emit the event
-        emit SubmitAggregatorRequestRaaS(transactionId, _cid, replication_num_copies, repair_threshold, renewal_threshold, miner);
+        emit SubmitAggregatorRequestWithRaaS(transactionId, _cid, _replication_target, _repair_threshold, _renew_threshold);
         return transactionId;
     }
 

contracts/mocks/IAggregatorOracleMock.sol

@@ -13,21 +13,24 @@ interface IAggregatorOracle {
     // Event emitted when a new request is submitted
     event SubmitAggregatorRequest(uint256 indexed id, bytes cid);
 
-    // Emitted when a new request is submitted with an ID, content identifier (CID) and other deal parameters.
-    event SubmitAggregatorRequestRaaS(
-        uint256 indexed id,
-        bytes cid,
-        uint replication_num_copies,
-        uint repair_threshold,
-        uint renewal_threshold,
-        string[] miner
-    );
+    //  Emitted when a new request is submitted with an ID, content identifier (CID), and RaaS parameters
+    event SubmitAggregatorRequestWithRaaS(uint256 indexed id, bytes cid,
+										  uint256 _replication_target, uint256 _repair_threshold,
+										  uint256 _renew_threshold);
 
     event CompleteAggregatorRequest(uint256 indexed id, uint64 indexed dealId);
 
     // Function that submits a new request to the oracle
     function submit(bytes memory _cid) external returns (uint256);
 
+    // Function to submit a new file to the aggregator, specifing the raas parameters
+	function submitRaaS(
+        bytes memory _cid,
+		uint256 _replication_target,
+        uint256 _repair_threshold,
+		uint256 _renew_threshold
+    ) external returns (uint256);
+
     // Callback function that is called by the aggregator
     function complete(
         uint256 _id,

tests/DealStatus.js

@@ -191,10 +191,10 @@ describe("Aggregator Tests", function () {
             this.dealstatus.submit(cid)
         })
 
-        it("Should submit a valid request with other deal parameters", async function () {
-            await expect(this.dealstatus.submit_raas(cid, 2, 100, 200, ['miner1', 'miner2', 'miner3']))
-                .to.emit(this.dealstatus, "SubmitAggregatorRequestRaaS")
-                .withArgs(3, cid, 2, 100, 200, ['miner1', 'miner2', 'miner3'])
+        it("Should submit a valid request with submitRaaS ", async function () {
+            await expect(this.dealstatus.submitRaaS(cid, 2, 100, 200))
+                .to.emit(this.dealstatus, "SubmitAggregatorRequestWithRaaS")
+                .withArgs(3, cid, 2, 100, 200)
         })
     })
 })