fix(subscribe tx): unsubscribe tx when submit return

wangchao · wangchao · commit fdd5bccb47c7 · 2022-06-01T14:19:14.000+08:00
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/core/Submit.java b/chainsql/src/main/java/com/peersafe/chainsql/core/Submit.java
@@ -227,22 +227,25 @@ public void called(Response args) {
 			}
 		}
 
-		if(sync){
-			if(submit_state == SubmitState.submit_error ||
-				(submit_state == SubmitState.send_success && condition == SyncCond.send_success)){
+		if (sync) {
+			if (submit_state == SubmitState.submit_error) {
 				return submitRes;
-			}else{
+			} else if (submit_state == SubmitState.send_success && condition == SyncCond.send_success) {
+				unSubscribeTx(tx.hash.toString());
+				return submitRes;
+			} else {
 				count = sync_maxtime / wait_milli;
-				while(sync_state != SyncState.sync_response){
+				while (sync_state != SyncState.sync_response) {
 					Util.waiting();
-					if(--count <= 0){
-						syncRes = getError("waiting sync result timeout",tx.hash.toString());
+					if (--count <= 0) {
+						syncRes = getError("waiting sync result timeout", tx.hash.toString());
 						break;
 					}
 				}
+				unSubscribeTx(tx.hash.toString());
 				return syncRes;
 			}
-		}else{
+		} else {
 			return submitRes;
 		}
 	}
@@ -279,14 +282,11 @@ public void called(JSONObject data) {
 
 					res.put("tx_hash", hash);
 
-					boolean bUnsubcribe = true;
 					String status = obj.getString("status");
 					switch (status) {
 						case "validate_success":
 							if (condition.compareTo(SyncCond.db_success) < 0) {
 								res.put("status", condition.toString());
-							} else {
-								bUnsubcribe = false;
 							}
 							break;
 						case "db_success":
@@ -309,12 +309,7 @@ public void called(JSONObject data) {
 							break;
 					}
 
-					//unsubscribe tx
-					if(bUnsubcribe) {
-						unSubscribeTx(hash);
-					}
-
-					if(!res.isNull("status") && sync_state == SyncState.waiting_sync){
+					if (!res.isNull("status") && sync_state == SyncState.waiting_sync) {
 						syncRes = res;
 						sync_state = SyncState.sync_response;
 						submit_state = SubmitState.send_success;
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/manager/EventManager.java b/chainsql/src/main/java/com/peersafe/chainsql/manager/EventManager.java
@@ -375,18 +375,18 @@ private void onTXMessage(JSONObject data){
 //			makeCallback(key,data);	
 //		}
 		makeCallback(key,data);	
-		if(data.has("transaction") && data.getJSONObject("transaction").has("TransactionType"))
-		{
-			JSONObject tx = data.getJSONObject("transaction");
-			TransactionType type = TransactionType.valueOf(tx.getString("TransactionType"));
-			if(Util.isChainsqlType(type)) {
-				if(!("validate_success".equals(data.getString("status")))){
-					mapCache.remove(key);
-				}
-			}else {
-				mapCache.remove(key);
-			}
-		}
+//		if(data.has("transaction") && data.getJSONObject("transaction").has("TransactionType"))
+//		{
+//			JSONObject tx = data.getJSONObject("transaction");
+//			TransactionType type = TransactionType.valueOf(tx.getString("TransactionType"));
+//			if(Util.isChainsqlType(type)) {
+//				if(!("validate_success".equals(data.getString("status")))){
+//					mapCache.remove(key);
+//				}
+//			}else {
+//				mapCache.remove(key);
+//			}
+//		}
 	}
 	
 
