fix: use xValue instead of x in typed log10

test: check equality not near in log10 tests test: fix ceil tests for typed ud60x18 library
PaulRBerg · Jun 16, 2021 · 17878fe · 17878fe
1 parent 77398e4
commit 17878fe
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/contracts/PRBMathUD60x18Typed.sol b/contracts/PRBMathUD60x18Typed.sol
@@ -277,7 +277,7 @@ library PRBMathUD60x18Typed {
 
         // prettier-ignore
         assembly {
-            switch x
+            switch xValue
             case 1 { rValue := mul(SCALE, sub(0, 18)) }
             case 10 { rValue := mul(SCALE, sub(1, 18)) }
             case 100 { rValue := mul(SCALE, sub(2, 18)) }

diff --git a/test/prbMathSd59x18/pure/log10.ts b/test/prbMathSd59x18/pure/log10.ts
@@ -46,8 +46,8 @@ export default function shouldBehaveLikeLog10(): void {
 
       forEach(testSets).it("takes %e and returns the correct value", async function (x: string) {
         const expected: BigNumber = fp(log10(x));
-        expect(expected).to.be.near(await this.contracts.prbMathSd59x18.doLog10(fp(x)));
-        expect(expected).to.be.near(await this.contracts.prbMathSd59x18Typed.doLog10(fp(x)));
+        expect(expected).to.equal(await this.contracts.prbMathSd59x18.doLog10(fp(x)));
+        expect(expected).to.equal(await this.contracts.prbMathSd59x18Typed.doLog10(fp(x)));
       });
     });
 

diff --git a/test/prbMathUd60x18/pure/ceil.ts b/test/prbMathUd60x18/pure/ceil.ts
@@ -23,6 +23,7 @@ export default function shouldBehaveLikeCeil(): void {
 
       forEach(testSets).it("takes %e and reverts", async function (x: BigNumber) {
         await expect(this.contracts.prbMathUd60x18.doCeil(x)).to.be.reverted;
+        await expect(this.contracts.prbMathUd60x18Typed.doCeil(x)).to.be.reverted;
       });
     });
 

diff --git a/test/prbMathUd60x18/pure/log10.ts b/test/prbMathUd60x18/pure/log10.ts
@@ -24,8 +24,8 @@ export default function shouldBehaveLikeLog10(): void {
 
       forEach(testSets).it("takes %e and returns the correct value", async function (x: string) {
         const expected: BigNumber = fp(log10(x));
-        expect(expected).to.be.near(await this.contracts.prbMathUd60x18.doLog10(fp(x)));
-        expect(expected).to.be.near(await this.contracts.prbMathUd60x18Typed.doLog10(fp(x)));
+        expect(expected).to.equal(await this.contracts.prbMathUd60x18.doLog10(fp(x)));
+        expect(expected).to.equal(await this.contracts.prbMathUd60x18Typed.doLog10(fp(x)));
       });
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ export default function shouldBehaveLikeCeil(): void { @@
           forEach(testSets).it("takes %e and reverts", async function (x: BigNumber) {
             await expect(this.contracts.prbMathUd60x18.doCeil(x)).to.be.reverted;
+            await expect(this.contracts.prbMathUd60x18Typed.doCeil(x)).to.be.reverted;
           });
         });
@@ Expand Down @@