fix merge bug:cannot get contract-event

luleigreat · luleigreat · commit 4be2298fb7c5 · 2019-01-25T10:47:24.000+08:00
diff --git a/solidity-example/solidity-TableTxs.sol b/solidity-example/solidity-TableTxs.sol
@@ -111,7 +111,8 @@ contract DBTest {
             {
                 string memory y = (db.getValueByIndex(handle, i, j));
                 xxx = concat(xxx, y);
-                xxx = concat(xxx, ", ");
+				if(j != col - 1)
+                	xxx = concat(xxx, ", ");
             }
             xxx = concat(xxx, ";\n");
         }
diff --git a/src/eventManager.js b/src/eventManager.js
@@ -162,29 +162,29 @@ function onMessage(that,dataRes){
 				}
 			}
 		}
-		else if(data.type === "contract_event" && that.cache[data.ContractAddress] !== undefined){
-			if(data.hasOwnProperty("ContractEventTopics")){
-				data.ContractEventTopics.map(function(topic,index){
-					data.ContractEventTopics[index] = "0x" + data.ContractEventTopics[index].toLowerCase();
-				});
-			}
-			if(data.hasOwnProperty("ContractEventInfo") && data.ContractEventInfo !== ""){
-				data.ContractEventInfo = "0x" + data.ContractEventInfo;
-			}
-			let key = data.ContractEventTopics[0];
-			if(that.cache[key]){
-				let contractObj = that.cache[data.ContractAddress];
-				let currentEvent = contractObj.options.jsonInterface.find(function (json) {
-					return (json.type === 'event' && json.signature === '0x'+ key.replace('0x',''));
-				});
-				let output = contractObj._decodeEventABI(currentEvent, data);
-				that.cache[key](null, output);
-				// delete that.cache[key];
-				// let keyIndex = contractObj.registeredEvent.indexOf(key);
-				// contractObj.registeredEvent.splice(keyIndex,1);
-			}
-		}
 	}
+	else if(data.type === "contract_event" && that.cache[data.ContractAddress] !== undefined){
+		if(data.hasOwnProperty("ContractEventTopics")){
+			data.ContractEventTopics.map(function(topic,index){
+				data.ContractEventTopics[index] = "0x" + data.ContractEventTopics[index].toLowerCase();
+			});
+		}
+		if(data.hasOwnProperty("ContractEventInfo") && data.ContractEventInfo !== ""){
+			data.ContractEventInfo = "0x" + data.ContractEventInfo;
+		}
+		let key = data.ContractEventTopics[0];
+		if(that.cache[key]){
+			let contractObj = that.cache[data.ContractAddress];
+			let currentEvent = contractObj.options.jsonInterface.find(function (json) {
+				return (json.type === 'event' && json.signature === '0x'+ key.replace('0x',''));
+			});
+			let output = contractObj._decodeEventABI(currentEvent, data);
+			that.cache[key](null, output);
+			// delete that.cache[key];
+			// let keyIndex = contractObj.registeredEvent.indexOf(key);
+			// contractObj.registeredEvent.splice(keyIndex,1);
+		}
+	}	
 }
 
 function _isChainsqlType(data){

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,8 @@ contract DBTest {`
`111`	`111`	`{`
`112`	`112`	`string memory y = (db.getValueByIndex(handle, i, j));`
`113`	`113`	`xxx = concat(xxx, y);`
`114`		`- xxx = concat(xxx, ", ");`
	`114`	`+ if(j != col - 1)`
	`115`	`+ xxx = concat(xxx, ", ");`
`115`	`116`	`}`
`116`	`117`	`xxx = concat(xxx, ";\n");`
`117`	`118`	`}`