Cannot specify ABIEncoderV2 pragma twice

axic · chriseth · commit aef32c535ea1 · 2019-02-13T17:43:02.000+01:00
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
@@ -65,7 +65,7 @@ class SolidityExecutionFramework: public dev::test::ExecutionFramework
 	{
 		// Silence compiler version warning
 		std::string sourceCode = "pragma solidity >=0.0;\n";
-		if (dev::test::Options::get().useABIEncoderV2)
+		if (dev::test::Options::get().useABIEncoderV2 && _sourceCode.find("pragma experimental ABIEncoderV2;") == std::string::npos)
 			sourceCode += "pragma experimental ABIEncoderV2;\n";
 		sourceCode += _sourceCode;
 		m_compiler.reset(false);

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class SolidityExecutionFramework: public dev::test::ExecutionFramework`
`65`	`65`	`{`
`66`	`66`	`// Silence compiler version warning`
`67`	`67`	`std::string sourceCode = "pragma solidity >=0.0;\n";`
`68`		`- if (dev::test::Options::get().useABIEncoderV2)`
	`68`	`+ if (dev::test::Options::get().useABIEncoderV2 && _sourceCode.find("pragma experimental ABIEncoderV2;") == std::string::npos)`
`69`	`69`	`sourceCode += "pragma experimental ABIEncoderV2;\n";`
`70`	`70`	`sourceCode += _sourceCode;`
`71`	`71`	`m_compiler.reset(false);`