Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
This commit is contained in:
		
						commit
						ccda1aacb4
					
				
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -69,22 +69,22 @@ func TestNotice(t *testing.T) { | ||||
| 	} | ||||
| 
 | ||||
| 	// https://github.com/ethereum/natspec.js/issues/1
 | ||||
| 	// badDesc := "Will multiply `e` by 7 and return `a * 7`."
 | ||||
| 	// notice, err = ns.Notice(tx, abi, method, badDesc)
 | ||||
| 	badDesc := "Will multiply `e` by 7 and return `a * 7`." | ||||
| 	notice, err = ns.Notice(tx, abi, method, badDesc) | ||||
| 
 | ||||
| 	// expected = "natspec.js error evaluating expression: wrong input param in expression ''"
 | ||||
| 	expected = "natspec.js error evaluating expression: Error: Natspec evaluation failed, wrong input params" | ||||
| 
 | ||||
| 	// if err == nil {
 | ||||
| 	// 	t.Errorf("expected error, got nothing (notice: '%v')", notice)
 | ||||
| 	// } else {
 | ||||
| 	// 	if err.Error() != expected {
 | ||||
| 	// 		t.Errorf("expected error '%s' got '%v' (notice: '%v')", expected, err, notice)
 | ||||
| 	// 	}
 | ||||
| 	// }
 | ||||
| 	if err == nil { | ||||
| 		t.Errorf("expected error, got nothing (notice: '%v')", notice) | ||||
| 	} else { | ||||
| 		if err.Error() != expected { | ||||
| 			t.Errorf("expected error '%s' got '%v' (notice: '%v')", expected, err, notice) | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	notice, err = ns.Notice(tx, abi, "missing_method", desc) | ||||
| 
 | ||||
| 	expected = "natspec.js error evaluating expression: wrong input params in expression 'Will multiply `a` by 7 and return `a * 7`.'" | ||||
| 	expected = "natspec.js error evaluating expression: Error: Natspec evaluation failed, method does not exist" | ||||
| 
 | ||||
| 	if err == nil { | ||||
| 		t.Errorf("expected error, got nothing (notice: '%v')", notice) | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user