Skip to content

Commit

Permalink
Detect and report errors for missing main transactions in clients and…
Browse files Browse the repository at this point in the history 
… missing arguments in main client transactions.
  • Loading branch information
@mcoblenz
mcoblenz committed Sep 1, 2019
1 parent 7a561c1 commit 303ebc5
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 37 deletions.
22 changes: 17 additions & 5 deletions src/main/scala/edu/cmu/cs/obsidian/Main.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ object Main {
return mainContractOption.get.name
}

def translateServerASTToJava (ast: Program, protobufOuterClassName: String, table: SymbolTable): JCodeModel = {
def translateServerASTToJava (ast: Program, protobufOuterClassName: String, table: SymbolTable): Either[String, JCodeModel] = {
// Server must have a main contract.
val mainContractOption = findMainContract(ast)
if (mainContractOption.isEmpty) {
Expand All @@ -132,7 +132,7 @@ object Main {
})
}

def translateClientASTToJava (ast: Program, protobufOuterClassName: String, table: SymbolTable): JCodeModel = {
def translateClientASTToJava (ast: Program, protobufOuterClassName: String, table: SymbolTable): Either[String, JCodeModel] = {
// Client programs must have a main contract.
val mainContractOption = findMainContract(ast)
if (mainContractOption.isEmpty) {
Expand Down Expand Up @@ -339,9 +339,21 @@ object Main {

val protobufOuterClassName = Util.protobufOuterClassNameForFilename(sourceFilename)

val javaModel = if (options.buildClient) translateClientASTToJava(checkedTable.ast, protobufOuterClassName, transformedTable)
else translateServerASTToJava(checkedTable.ast, protobufOuterClassName, transformedTable)
javaModel.build(srcDir.toFile)
val errorOrJavaModel =
if (options.buildClient) {
translateClientASTToJava(checkedTable.ast, protobufOuterClassName, transformedTable)
} else {
translateServerASTToJava(checkedTable.ast, protobufOuterClassName, transformedTable)
}

errorOrJavaModel match {
case Left(errorMessage) => {
println(errorMessage)
return false
}
case Right(javaModel) =>
javaModel.build(srcDir.toFile)
}

val mainName = findMainContractName(checkedTable.ast)

Expand Down
75 changes: 43 additions & 32 deletions src/main/scala/edu/cmu/cs/obsidian/codegen/CodeGen.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ class CodeGen (val target: Target, table: SymbolTable) {
}

def translateProgram(program: Program,
protobufOuterClassName: String): JCodeModel = {
protobufOuterClassName: String): Either[String, JCodeModel] = {
// Put all generated code in the same package.
val programPackage: JPackage = model._package(packageName)
translateProgramInPackage(program, protobufOuterClassName, programPackage)
}

private def translateProgramInPackage(program: Program,
protobufOuterClassName: String,
programPackage: JPackage): JCodeModel = {
programPackage: JPackage): Either[String, JCodeModel] = {
val contractNameResolutionMap: Map[Contract, String] = TranslationContext.contractNameResolutionMapForProgram(program)
val protobufOuterClassNames = mutable.HashMap.empty[String, String]

Expand Down Expand Up @@ -140,8 +140,10 @@ class CodeGen (val target: Target, table: SymbolTable) {
(con, newClass) match {
case (obsCon: ObsidianContractImpl, Some(newClass)) => {
val translationContext = makeTranslationContext(obsCon, newClass, contractNameResolutionMap, protobufOuterClassNames, false)
translateOuterContract(obsCon, programPackage, protobufOuterClassName, contractNameResolutionMap, protobufOuterClassNames, translationContext, newClass)

val translationError = translateOuterContract(obsCon, programPackage, protobufOuterClassName, contractNameResolutionMap, protobufOuterClassNames, translationContext, newClass)
if (translationError.isDefined) {
return Left(translationError.get)
}
if (obsCon.isImport) {
target match {
case Client(mainContract, _) =>
Expand All @@ -155,7 +157,7 @@ class CodeGen (val target: Target, table: SymbolTable) {
}
}

model
Right(model)
}


Expand Down Expand Up @@ -1310,7 +1312,7 @@ class CodeGen (val target: Target, table: SymbolTable) {
contractNameResolutionMap: Map[Contract, String],
protobufOuterClassNames: Map[String, String],
translationContext: TranslationContext,
newClass: JDefinedClass) = {
newClass: JDefinedClass): Option[String] = {
translateContract(aContract, newClass, translationContext)

if (!aContract.isInterface) {
Expand All @@ -1323,7 +1325,10 @@ class CodeGen (val target: Target, table: SymbolTable) {
if (aContract == mainContract) {
newClass._extends(model.directClass("edu.cmu.cs.obsidian.client.ChaincodeClientBase"))
generateClientMainMethod(newClass)
generateInvokeClientMainMethod(aContract, newClass)
val invocationResult = generateInvokeClientMainMethod(aContract, newClass)
if (invocationResult.nonEmpty) {
return invocationResult
}
} else {
generateRunMethod(newClass, translationContext, stubType)
generateSerialization(aContract, newClass, translationContext)
Expand Down Expand Up @@ -1370,6 +1375,8 @@ class CodeGen (val target: Target, table: SymbolTable) {
generateConstructorReturnsOwnedReference(newClass)
}
}

None
}

private def translateInnerContract(aContract: Contract,
Expand Down Expand Up @@ -1832,7 +1839,14 @@ class CodeGen (val target: Target, table: SymbolTable) {
* It should construct a stub according to the type of the client's main(),
* and pass it to the client's main() method.
*/
private def generateInvokeClientMainMethod(aContract: Contract, newClass: JDefinedClass) = {
private def generateInvokeClientMainMethod(aContract: Contract, newClass: JDefinedClass): Option[String] = {
val mainTransactionOption: Option[Transaction] = aContract.declarations.find((d: Declaration) => d.isInstanceOf[Transaction] && d.asInstanceOf[Transaction].name.equals("main"))
.asInstanceOf[Option[Transaction]]

if (mainTransactionOption.isEmpty) {
return Some("Error: can't find main transaction in main contract " + aContract.name)
}

val method = newClass.method(JMod.PUBLIC, model.VOID, "invokeClientMain")
method._throws(model.parseType("com.google.protobuf.InvalidProtocolBufferException").asInstanceOf[AbstractJClass])
method._throws(model.ref("edu.cmu.cs.obsidian.client.ChaincodeClientAbortTransactionException"))
Expand All @@ -1845,34 +1859,31 @@ class CodeGen (val target: Target, table: SymbolTable) {
method._throws(model.directClass("edu.cmu.cs.obsidian.chaincode.IllegalOwnershipConsumptionException"))
method._throws(model.directClass("edu.cmu.cs.obsidian.chaincode.WrongNumberOfArgumentsException"))

val mainTransactionOption: Option[Transaction] = aContract.declarations.find((d: Declaration) => d.isInstanceOf[Transaction] && d.asInstanceOf[Transaction].name.equals("main"))
.asInstanceOf[Option[Transaction]]
val mainTransaction: Transaction = mainTransactionOption.get

if (mainTransactionOption.isEmpty) {
println("Error: can't find main transaction in main contract " + aContract.name)
// The main transaction expects to be passed a stub of a particular type. Construct it.
if (mainTransaction.args.length == 0) {
return Some("Error: main transaction should take an argument referencing a smart contract.")
}
else {
val mainTransaction: Transaction = mainTransactionOption.get

// The main transaction expects to be passed a stub of a particular type. Construct it.
val stubType: ObsidianType = mainTransaction.args(0).typIn
val stubJavaType = resolveType(stubType, table)
val newStubExpr = JExpr._new(stubJavaType)
newStubExpr.arg(JExpr.ref("connectionManager"))
val generateUUID = stubType match {
case n: NonPrimitiveType =>
n.codeGenName
case _ => assert(false, "Stub must be of nonprimitive type.")
""
}
newStubExpr.arg(generateUUID)
val stubVariable = method.body().decl(stubJavaType, "stub", newStubExpr)
// generate a new serialization state to be compatible
val serializationState = method.body.decl(model.directClass("edu.cmu.cs.obsidian.client.ChaincodeClientSerializationState"), serializationParamName, JExpr._new(model.directClass("edu.cmu.cs.obsidian.client.ChaincodeClientSerializationState")))
val clientMainInvocation = method.body.invoke("main")
clientMainInvocation.arg(stubVariable).arg(serializationState)

val stubType: ObsidianType = mainTransaction.args(0).typIn
val stubJavaType = resolveType(stubType, table)
val newStubExpr = JExpr._new(stubJavaType)
newStubExpr.arg(JExpr.ref("connectionManager"))
val generateUUID = stubType match {
case n: NonPrimitiveType =>
n.codeGenName
case _ => assert(false, "Stub must be of nonprimitive type.")
""
}
newStubExpr.arg(generateUUID)
val stubVariable = method.body().decl(stubJavaType, "stub", newStubExpr)
// generate a new serialization state to be compatible
val serializationState = method.body.decl(model.directClass("edu.cmu.cs.obsidian.client.ChaincodeClientSerializationState"), serializationParamName, JExpr._new(model.directClass("edu.cmu.cs.obsidian.client.ChaincodeClientSerializationState")))
val clientMainInvocation = method.body.invoke("main")
clientMainInvocation.arg(stubVariable).arg(serializationState)

None
}

private def generateSerialization(
Expand Down

0 comments on commit 303ebc5

Please sign in to comment.