update merge logic

This commit is contained in:
CaiHQ 2023-06-06 17:54:26 +08:00
parent 9c77aed029
commit 5e2a8ca38c

View File

@ -6,6 +6,7 @@ import java.util.Map;
public class ContractZipBundle { public class ContractZipBundle {
ContractManifest cm; ContractManifest cm;
Map<String, ContractNode> path2Node; Map<String, ContractNode> path2Node;
private ContractNode mergedContractNode;
public ContractZipBundle() { public ContractZipBundle() {
path2Node = new HashMap<>(); path2Node = new HashMap<>();
@ -28,6 +29,10 @@ public class ContractZipBundle {
} }
public ContractNode mergeContractNode() { public ContractNode mergeContractNode() {
return mergedContractNode;
}
public void setMergedContractNode() {
ContractNode cn = new ContractNode(null); ContractNode cn = new ContractNode(null);
cn.memorySet = cm.memory; cn.memorySet = cm.memory;
cn.setIsBundle(true); cn.setIsBundle(true);
@ -41,6 +46,6 @@ public class ContractZipBundle {
cn.merge(contract); cn.merge(contract);
} }
cn.mergeInterfaceAnnotationIntoFunction(); cn.mergeInterfaceAnnotationIntoFunction();
return cn; this.mergedContractNode = cn;
} }
} }