fix forge build errors

nkrishang · nkrishang · commit 6e96ffcc1ed2 · 2022-12-10T22:47:02.000+05:30
diff --git a/contracts/staking/EditionStake.sol b/contracts/staking/EditionStake.sol
@@ -84,7 +84,7 @@ contract EditionStake is
         uint256,
         uint256,
         bytes calldata
-    ) external returns (bytes4) {
+    ) external pure returns (bytes4) {
         return this.onERC1155Received.selector;
     }
 
diff --git a/src/test/Forwarder.t.sol b/src/test/Forwarder.t.sol
@@ -49,6 +49,7 @@ contract ForwarderTest is BaseTest {
 
     function signForwarderRequest(Forwarder.ForwardRequest memory forwardRequest, uint256 privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/ForwarderChainlessDomain.t.sol b/src/test/ForwarderChainlessDomain.t.sol
@@ -50,6 +50,7 @@ contract ForwarderChainlessDomainTest is BaseTest {
 
     function signForwarderRequest(ForwarderChainlessDomain.ForwardRequest memory forwardRequest, uint256 privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/SignatureDrop.t.sol b/src/test/SignatureDrop.t.sol
@@ -83,6 +83,7 @@ contract SignatureDropBenchmarkTest is BaseTest {
 
     function signMintRequest(SignatureDrop.MintRequest memory _request, uint256 privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
@@ -731,6 +732,7 @@ contract SignatureDropTest is BaseTest {
 
     function signMintRequest(SignatureDrop.MintRequest memory mintrequest, uint256 privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/sdk/base/ERC1155SignatureMint.t.sol b/src/test/sdk/base/ERC1155SignatureMint.t.sol
@@ -32,6 +32,7 @@ contract ERC1155SignatureMintTest is DSTest, Test {
 
     function signMintRequest(ERC1155SignatureMint.MintRequest memory _request, uint256 privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/sdk/base/ERC20SignatureMint.t.sol b/src/test/sdk/base/ERC20SignatureMint.t.sol
@@ -55,6 +55,7 @@ contract BaseERC20SignatureMintTest is BaseUtilTest {
 
     function signMintRequest(ERC20SignatureMint.MintRequest memory _request, uint256 _privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/sdk/base/ERC20SignatureMintVote.t.sol b/src/test/sdk/base/ERC20SignatureMintVote.t.sol
@@ -55,6 +55,7 @@ contract BaseERC20SignatureMintVoteTest is BaseUtilTest {
 
     function signMintRequest(ERC20SignatureMintVote.MintRequest memory _request, uint256 _privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/sdk/base/ERC721SignatureMint.t.sol b/src/test/sdk/base/ERC721SignatureMint.t.sol
@@ -58,6 +58,7 @@ contract BaseERC721SignatureMintTest is BaseUtilTest {
 
     function signMintRequest(ERC721SignatureMint.MintRequest memory _request, uint256 _privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/sdk/extension/SignatureMintERC1155.t.sol b/src/test/sdk/extension/SignatureMintERC1155.t.sol
@@ -78,6 +78,7 @@ contract ExtensionSignatureMintERC1155 is DSTest, Test {
 
     function signMintRequest(MySigMint1155.MintRequest memory _request, uint256 _privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/sdk/extension/SignatureMintERC20.t.sol b/src/test/sdk/extension/SignatureMintERC20.t.sol
@@ -74,6 +74,7 @@ contract ExtensionSignatureMintERC20 is DSTest, Test {
 
     function signMintRequest(MySigMint20.MintRequest memory _request, uint256 _privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/sdk/extension/SignatureMintERC721.t.sol b/src/test/sdk/extension/SignatureMintERC721.t.sol
@@ -77,6 +77,7 @@ contract ExtensionSignatureMintERC721 is DSTest, Test {
 
     function signMintRequest(MySigMint721.MintRequest memory _request, uint256 _privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/staking/TokenStake.t.sol b/src/test/staking/TokenStake.t.sol
@@ -276,10 +276,10 @@ contract TokenStakeTest is BaseTest {
 
     function test_state_setTimeUnit() public {
         // set value and check
-        uint256 timeUnit = 100;
+        uint256 timeUnitToSet = 100;
         vm.prank(deployer);
-        stakeContract.setTimeUnit(timeUnit);
-        assertEq(timeUnit, stakeContract.timeUnit());
+        stakeContract.setTimeUnit(timeUnitToSet);
+        assertEq(timeUnitToSet, stakeContract.timeUnit());
 
         //================ stake tokens
         vm.warp(1);
@@ -302,7 +302,7 @@ contract TokenStakeTest is BaseTest {
 
         assertEq(
             _availableRewards,
-            (((((block.timestamp - timeOfLastUpdate) * 400) * rewardRatioNumerator) / timeUnit) /
+            (((((block.timestamp - timeOfLastUpdate) * 400) * rewardRatioNumerator) / timeUnitToSet) /
                 rewardRatioDenominator)
         );
 
diff --git a/src/test/token/TokenERC1155.t.sol b/src/test/token/TokenERC1155.t.sol
@@ -85,6 +85,7 @@ contract TokenERC1155Test is BaseTest {
 
     function signMintRequest(TokenERC1155.MintRequest memory _request, uint256 _privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/token/TokenERC20.t.sol b/src/test/token/TokenERC20.t.sol
@@ -82,6 +82,7 @@ contract TokenERC20Test is BaseTest {
 
     function signMintRequest(TokenERC20.MintRequest memory _request, uint256 _privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(
diff --git a/src/test/token/TokenERC721.t.sol b/src/test/token/TokenERC721.t.sol
@@ -83,6 +83,7 @@ contract TokenERC721Test is BaseTest {
 
     function signMintRequest(TokenERC721.MintRequest memory _request, uint256 _privateKey)
         internal
+        view
         returns (bytes memory)
     {
         bytes memory encodedRequest = abi.encode(

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ contract EditionStake is`
`84`	`84`	`uint256,`
`85`	`85`	`uint256,`
`86`	`86`	`bytes calldata`
`87`		`- ) external returns (bytes4) {`
	`87`	`+ ) external pure returns (bytes4) {`
`88`	`88`	`return this.onERC1155Received.selector;`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ contract ForwarderTest is BaseTest {`
`49`	`49`
`50`	`50`	`function signForwarderRequest(Forwarder.ForwardRequest memory forwardRequest, uint256 privateKey)`
`51`	`51`	`internal`
	`52`	`+ view`
`52`	`53`	`returns (bytes memory)`
`53`	`54`	`{`
`54`	`55`	`bytes memory encodedRequest = abi.encode(`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ contract ForwarderChainlessDomainTest is BaseTest {`
`50`	`50`
`51`	`51`	`function signForwarderRequest(ForwarderChainlessDomain.ForwardRequest memory forwardRequest, uint256 privateKey)`
`52`	`52`	`internal`
	`53`	`+ view`
`53`	`54`	`returns (bytes memory)`
`54`	`55`	`{`
`55`	`56`	`bytes memory encodedRequest = abi.encode(`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ contract SignatureDropBenchmarkTest is BaseTest {`
`83`	`83`
`84`	`84`	`function signMintRequest(SignatureDrop.MintRequest memory _request, uint256 privateKey)`
`85`	`85`	`internal`
	`86`	`+ view`
`86`	`87`	`returns (bytes memory)`
`87`	`88`	`{`
`88`	`89`	`bytes memory encodedRequest = abi.encode(`
`@@ -731,6 +732,7 @@ contract SignatureDropTest is BaseTest {`
`731`	`732`
`732`	`733`	`function signMintRequest(SignatureDrop.MintRequest memory mintrequest, uint256 privateKey)`
`733`	`734`	`internal`
	`735`	`+ view`
`734`	`736`	`returns (bytes memory)`
`735`	`737`	`{`
`736`	`738`	`bytes memory encodedRequest = abi.encode(`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ contract ERC1155SignatureMintTest is DSTest, Test {`
`32`	`32`
`33`	`33`	`function signMintRequest(ERC1155SignatureMint.MintRequest memory _request, uint256 privateKey)`
`34`	`34`	`internal`
	`35`	`+ view`
`35`	`36`	`returns (bytes memory)`
`36`	`37`	`{`
`37`	`38`	`bytes memory encodedRequest = abi.encode(`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ contract BaseERC20SignatureMintTest is BaseUtilTest {`
`55`	`55`
`56`	`56`	`function signMintRequest(ERC20SignatureMint.MintRequest memory _request, uint256 _privateKey)`
`57`	`57`	`internal`
	`58`	`+ view`
`58`	`59`	`returns (bytes memory)`
`59`	`60`	`{`
`60`	`61`	`bytes memory encodedRequest = abi.encode(`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ contract BaseERC721SignatureMintTest is BaseUtilTest {`
`58`	`58`
`59`	`59`	`function signMintRequest(ERC721SignatureMint.MintRequest memory _request, uint256 _privateKey)`
`60`	`60`	`internal`
	`61`	`+ view`
`61`	`62`	`returns (bytes memory)`
`62`	`63`	`{`
`63`	`64`	`bytes memory encodedRequest = abi.encode(`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ contract ExtensionSignatureMintERC1155 is DSTest, Test {`
`78`	`78`
`79`	`79`	`function signMintRequest(MySigMint1155.MintRequest memory _request, uint256 _privateKey)`
`80`	`80`	`internal`
	`81`	`+ view`
`81`	`82`	`returns (bytes memory)`
`82`	`83`	`{`
`83`	`84`	`bytes memory encodedRequest = abi.encode(`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ contract ExtensionSignatureMintERC20 is DSTest, Test {`
`74`	`74`
`75`	`75`	`function signMintRequest(MySigMint20.MintRequest memory _request, uint256 _privateKey)`
`76`	`76`	`internal`
	`77`	`+ view`
`77`	`78`	`returns (bytes memory)`
`78`	`79`	`{`
`79`	`80`	`bytes memory encodedRequest = abi.encode(`