去掉exists

buckyos · Dec 20, 2023 · 5ba87bf · 5ba87bf
1 parent 69d1aeb
commit 5ba87bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/contracts/public_data_storage.sol b/contracts/public_data_storage.sol
@@ -340,7 +340,8 @@ contract PublicDataStorage {
         require(block.number > cycleNumber * blocksPerCycle + startBlock);
         CycleInfo storage cycleInfo = cycle_infos[_cycleNumber()];
         CycleDataInfo storage dataInfo = cycleInfo.data_infos[dataMixedHash];
-        require(cycleInfo.score_list.exists(dataMixedHash));
+        uint256 scoreListRanking = cycleInfo.score_list.getRanking(dataMixedHash);
+        require(scoreListRanking > 0);
 
         // 看看是谁来取
         uint8 withdrawUser = _getWithdrawUser(dataMixedHash);
@@ -352,7 +353,7 @@ contract PublicDataStorage {
         uint256 totalReward = cycleInfo.total_award * 8 / 10;
         // 积分规则我先自己定一个, 参见最顶上的注释
         uint256 totalScore = (1 + topRewards) * topRewards / 2;
-        uint256 ranking = topRewards - cycleInfo.score_list.getRanking(dataMixedHash) + 1;
+        uint256 ranking = topRewards - scoreListRanking + 1;
         uint256 dataReward = totalReward * ranking / totalScore;
 
         uint256 reward = _calcuteReward(withdrawUser, dataReward);

diff --git a/contracts/test_list.sol b/contracts/test_list.sol
@@ -27,10 +27,6 @@ contract TestList {
         return list.maxlen();
     }
 
-    function exists(bytes32 mixedHash) public view returns (bool) {
-        return list.exists(mixedHash);
-    }
-
     function getRanking(bytes32 mixedHash) public view returns (uint256) {
         return list.getRanking(mixedHash);
     }

diff --git a/test/test_public_data.ts b/test/test_public_data.ts
@@ -29,15 +29,15 @@ describe("PublicDataStorage", function () {
 
         nftContract = await (await hre.ethers.deployContract("FakeNFTContract")).waitForDeployment();
 
-        contract = await (await hre.ethers.deployContract("PublicDataStorage", {libraries: {
-            SortedScoreList: await listLibrary.getAddress()
-        }})).waitForDeployment();
+//        contract = await (await hre.ethers.deployContract("PublicDataStorage", {libraries: {
+//            SortedScoreList: await listLibrary.getAddress()
+//        }})).waitForDeployment();
     }
 
     before(async () => {
         await deployContracts();
 
-        await ((await nftContract.addData("", 1)).wait());
+//        await ((await nftContract.addData("", 1)).wait());
     });
 
     it("create NFT public data");

diff --git a/test/test_sortedlist.ts b/test/test_sortedlist.ts
@@ -61,7 +61,6 @@ describe("ShortedList", function () {
     it("one element", async () => {
         await (await contract.addScore(testDatas[0].hash, testDatas[0].score)).wait();
 
-        expect(await contract.exists(testDatas[0].hash)).to.equal(true);
         expect(await contract.getLength()).to.equal(1);
 
         expect(await contract.getRanking(testDatas[0].hash)).to.equal(1);