Fixes creation gas estimate display, removes solidity interface field that is no longer in solc compiler results

Author: bmcd

cakeshop-api/src/main/java/com/jpmorgan/cakeshop/model/Contract.java

@@ -3,10 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.jpmorgan.cakeshop.model.SolcResponse.GasEstimates;
 import com.jpmorgan.cakeshop.service.ContractService.CodeType;
-import java.util.Map;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Map;
+
 public class Contract {
 
     public static final String API_DATA_TYPE = "contract";
@@ -56,11 +57,6 @@ public class Contract {
      */
     private GasEstimates gasEstimates;
 
-    /**
-     * Contract interface in solidity code
-     */
-    private String solidityInterface;
-
     /**
      * Hash of each method signaature (required for making EVM calls)
      */
@@ -168,14 +164,6 @@ public void setGasEstimates(GasEstimates gasEstimates) {
         this.gasEstimates = gasEstimates;
     }
 
-    public String getSolidityInterface() {
-        return solidityInterface;
-    }
-
-    public void setSolidityInterface(String solidityInterface) {
-        this.solidityInterface = solidityInterface;
-    }
-
     public Map<String, String> getFunctionHashes() {
         return functionHashes;
     }

cakeshop-api/src/main/webapp/js/sandbox.js

@@ -268,7 +268,6 @@
     var getDetails = function(contract, source, contractName) {
         // solidity interface
       var details = $('<div class="contractDetails"/>')
-        .append(textRow('Solidity Interface', contract.get("solidityInterface")));
 
         // function hashes
       var funHashes = '';
@@ -288,7 +287,7 @@
       var gasToText = function(g) { return g === null ? 'unknown' : g; };
       var text = '';
       if ('creation' in data)
-        text += 'Creation: ' + gasToText(data.creation[0]) + ' + ' + gasToText(data.creation[1]) + '\n';
+        text += 'Creation: ' + gasToText(data.creation.codeDepositCost) + ' + ' + gasToText(data.creation.executionCost) + '\n';
       text += 'External:\n';
       for (var fun in data.external) {
         text += '  ' + fun + ': ' + gasToText(data.external[fun]) + '\n';