Merge branch 'master' into sload-sstore

xpepermint · web-flow · commit 39f6855ab1b3 · 2021-05-20T08:43:00.000+02:00
diff --git a/src/contracts/tokens/nf-token.sol b/src/contracts/tokens/nf-token.sol
@@ -373,7 +373,7 @@ contract NFToken is
     virtual
   {
     require(idToOwner[_tokenId] == _from, NOT_OWNER);
-    ownerToNFTokenCount[_from] = ownerToNFTokenCount[_from] - 1;
+    ownerToNFTokenCount[_from] -= 1;
     delete idToOwner[_tokenId];
   }
 
@@ -393,7 +393,7 @@ contract NFToken is
     require(idToOwner[_tokenId] == address(0), NFT_ALREADY_EXISTS);
 
     idToOwner[_tokenId] = _to;
-    ownerToNFTokenCount[_to] = ownerToNFTokenCount[_to] + 1;
+    ownerToNFTokenCount[_to] += 1;
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ contract NFToken is`
`373`	`373`	`virtual`
`374`	`374`	`{`
`375`	`375`	`require(idToOwner[_tokenId] == _from, NOT_OWNER);`
`376`		`- ownerToNFTokenCount[_from] = ownerToNFTokenCount[_from] - 1;`
	`376`	`+ ownerToNFTokenCount[_from] -= 1;`
`377`	`377`	`delete idToOwner[_tokenId];`
`378`	`378`	`}`
`379`	`379`
`@@ -393,7 +393,7 @@ contract NFToken is`
`393`	`393`	`require(idToOwner[_tokenId] == address(0), NFT_ALREADY_EXISTS);`
`394`	`394`
`395`	`395`	`idToOwner[_tokenId] = _to;`
`396`		`- ownerToNFTokenCount[_to] = ownerToNFTokenCount[_to] + 1;`
	`396`	`+ ownerToNFTokenCount[_to] += 1;`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`/**`