remove useless schemaid related code

luleigreat · luleigreat · commit 03e1aa4f3269 · 2021-04-30T15:02:41.000+08:00
diff --git a/src/connect.js b/src/connect.js
@@ -17,10 +17,6 @@ Connection.prototype.useCert = function(cert) {
   this.userCert = cert;
 }
 
-Connection.prototype.setSchema = function(schemaID) {
-  this.schemaID = schemaID;
-}
-
 Connection.prototype.connect = function() {
   let that = this;
   return new Promise(function(resolve, reject) {
diff --git a/src/eventManager.js b/src/eventManager.js
@@ -28,16 +28,10 @@ EventManager.prototype.subscribeTable = function(owner, name, cb) {
 };
 EventManager.prototype.subscribeTx = function(id, cb) {
 	var that = this;
-
-    var schema_id = ""
-    if(that.chainsql.connect.schemaID !=undefined){
-      schema_id = that.chainsql.connect.schemaID
-	}
-	
+		
 	var messageTx = {
 		"command": "subscribe",
 		"transaction": id,
-		schema_id: schema_id,
 	};
 	if (!that.onMessage) {
 		_onMessage(that);
diff --git a/src/index.js b/src/index.js
@@ -1254,21 +1254,6 @@ ChainsqlAPI.prototype.modifySchema = function(schemaInfo){
 		throw new Error("Invalid modifySchema parameter");
 	}       
 	
-	// var validators = []
-	// var i   = 0
-	// var len = schemaInfo.Validators.length
-
-	// for(; i < len; i++) {
-	// 	var hexValidator = convertStringToHex(schemaInfo.Validators[i].Validator.PublicKey)
-
-	// 	var item = {
-	// 		Validator:{
-	// 			PublicKey:hexValidator
-	// 		}
-	// 	}
-	// 	validators.push(item)  
-	// }
-
 	var peerlists = []
 	var i   = 0;
 	var len = schemaInfo.PeerList.length
@@ -1303,25 +1288,6 @@ ChainsqlAPI.prototype.modifySchema = function(schemaInfo){
 
 	// 修改子链
 	this.schemaModifyTx = true;
-
-	// let payment = {
-	// 	Account: that.connect.address,
-	// 	SchemaID:"595FC1AA0C73D735C3362A0E9976A64E024C86976E08C02D299DB344CF674650",
-	// 	OpType: 1,
-	// 	Validators:[
-	// 		{
-	// 			Validator:{PublicKey:"02BD87A95F549ECF607D6AE3AEC4C95D0BFF0F49309B4E7A9F15B842EB62A8ED1A"}
-	// 		}
-	// 	],
-	// 	PeerList:[
-	// 		{
-	// 			Peer:{ Endpoint:convertStringToHex("192.168.29.116:7017") }
-	// 		}
-
-  	// 	],
-	// 	TransactionType: 'SchemaModify'
-	// };
-
 	this.payment = schemaModifyTxJson;
 	return this;
 
diff --git a/src/ripple.js b/src/ripple.js
@@ -74,12 +74,6 @@ Ripple.prototype.prepareJson = function () {
 						}
 					}
 
-					//self.connect
-
-					if(self.ChainsqlAPI.connect.schemaID != undefined){
-						self.ChainsqlAPI.api.schemaID = self.ChainsqlAPI.connect.schemaID;
-					}
-
 					self.ChainsqlAPI.api.preparePayment(self.ChainsqlAPI.connect.address, txJson, instructions)
 						.then(function (data) {
 							resolve(data);
diff --git a/test/testRipple.js b/test/testRipple.js
@@ -39,12 +39,13 @@ var sCurrency = "aaa"
 main();
 async function main() {
     // let res = await c.connect('ws://101.201.40.124:5006');
-    let res = await c.connect('ws://127.0.0.1:6006');
+    let res = await c.connect('ws://192.168.29.69:6305');
+    await c.setSchema("8B0BA6D8848C76E19433EE90E2A88210E403339F2C5AC750271EFC862A173894");
 
     c.as(root);
     c.setRestrict(true);
     /**************************************/
-    let nStep = tagStep.escrow;
+    let nStep = tagStep.gateWay;
     switch (nStep) {
         case tagStep.active: testActive(); break;// 激活若干账户
         case tagStep.gateWay: testGateWay(); break;//部署网管，信任，发行币转账

Original file line number	Diff line number	Diff line change
`@@ -74,12 +74,6 @@ Ripple.prototype.prepareJson = function () {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- //self.connect`
`78`		`-`
`79`		`- if(self.ChainsqlAPI.connect.schemaID != undefined){`
`80`		`- self.ChainsqlAPI.api.schemaID = self.ChainsqlAPI.connect.schemaID;`
`81`		`- }`
`82`		`-`
`83`	`77`	`self.ChainsqlAPI.api.preparePayment(self.ChainsqlAPI.connect.address, txJson, instructions)`
`84`	`78`	`.then(function (data) {`
`85`	`79`	`resolve(data);`