| 
							
							
								 Greg Hysen | b596e02752 | readability cleanup | 2019-06-05 14:08:25 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | d5afe696da | removed .only from tests | 2019-06-05 14:08:25 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 98c8a6387a | manually copy ids, values, and data fields | 2019-06-05 14:08:25 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 8bae0b81aa | Added ERC1155Proxy tests when data overlaps values in asset data | 2019-06-05 14:08:25 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 7ee19e1306 | Added new tests for different lengths of receiver callback data, since we are now appending scaledValues after data. | 2019-06-05 14:08:25 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 626d0dfa93 | Store scaled values and end of calldata in ERC1155 Asset Proxy | 2019-06-05 14:08:25 -07:00 |  | 
			
				
					| 
							
							
								 Fabio Berger | 84d38ea878 | Add assertions to abi-gen templates and fix tests | 2019-06-04 13:18:01 +01:00 |  | 
			
				
					| 
							
							
								 Lawrence Forman | 4d493eeebd | In @0x/contracts-asset-proxy: Update tests to use contract-built-inawaitTransactionSuccessAsync(). | 2019-04-28 22:25:12 -04:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 7ed3afe9f0 | Updated function signature for ERC1155 ProxyId - ERC1155Token -> ERC1155Assets | 2019-03-19 15:35:08 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 98c6fa10e6 | Added 1explicit ERC1555Poxy testsfor cwhen receiver allback data is NULLL (0x) | 2019-03-19 09:37:16 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 22bc1fb21e | additional zero outcome tests | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 63ba764de8 | renamed perUnitValue to valueMultiplier | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 6a7530d741 | added test for amount=0 | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 9207d1c680 | Do not revert if value or amount are zero. Only if amount is non-zero and there is an overflow. | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 9ec380777a | Rebased against development | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 1e5648111e | Updated changelogs and documentation for erc1155 proxy | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | ae51cfe8b9 | Added method descriptions to erc1155 proxy wrapper | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 05ef250ab4 | Ran prettier & linter | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 38e4871f32 | Moved transferFrom with/without logs into ERC1155 Proxy Wrapper | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | a86ba7af2e | moved transferFrom into ERC1155 Proxy Wrapper | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 55c4fc9aca | Ran prettier / linter | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 888c17353b | Renamed erc1155token to erc1155Contract in proxy tests | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 054c0e91a3 | removed erc1155 proxy tests from general proxy test file | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 4dfb610eba | updated erc1155 proxy tests and moved to their own test file | 2019-03-15 15:05:02 -07:00 |  |