delete subchain interface

xiuxiufxx · xiuxiufxx · commit 5fc0380e7851 · 2022-04-25T16:02:53.000+08:00
diff --git a/chainsql/src/main/java/com/peersafe/base/core/formats/TxFormat.java b/chainsql/src/main/java/com/peersafe/base/core/formats/TxFormat.java
@@ -222,6 +222,11 @@ public String name() {
             Field.PeerList,            Requirement.REQUIRED,
             Field.SchemaID,            Requirement.REQUIRED);
     
+    static public TxFormat SchemaDelete = new TxFormat(
+            TransactionType.SchemaDelete,
+            Field.SchemaID,            Requirement.REQUIRED);
+    
+    
     static public TxFormat Authorize = new TxFormat(
             TransactionType.Authorize,
             Field.Account,              Requirement.REQUIRED,
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java b/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java
@@ -437,6 +437,7 @@ JSONObject prepareSigned() {
 			switch(txType_){
 				case SchemaCreate:
 				case SchemaModify:
+				case SchemaDelete:
 				case FreezeAccount:
 				{
 					payment = toTransaction(mTxJson,txType_);
@@ -627,7 +628,6 @@ public Chainsql createSchema(JSONObject schemaInfo) throws Exception{
 		return this;
 	}
 
-
 	public Chainsql modifySchema(SchemaOpType type,JSONObject schemaInfo)   throws Exception{
 
 		boolean bValid = schemaInfo.has("SchemaID")  && schemaInfo.has("Validators") && schemaInfo.has("PeerList");
@@ -684,6 +684,22 @@ public Chainsql modifySchema(SchemaOpType type,JSONObject schemaInfo)   throws E
 		return this;
 	}
 
+	public Chainsql deleteSchema(String schemaID)   throws Exception{
+
+		if(schemaID == null || schemaID.equals(""))
+			throw new Exception("Invalid schemaInfo parameter");
+
+		this.txType_ = TransactionType.SchemaDelete;
+
+		JSONObject params = new JSONObject();
+		
+		params.put("Account", this.connection.address);
+		params.put("SchemaID",schemaID);
+
+		this.mTxJson = params;
+		return this;
+	}
+
 
 	
 	private Chainsql createTable(String name, List<String> rawList, JSONObject operationRule,boolean confidential) {
diff --git a/chainsql/src/test/java/com/peersafe/chainsql/core/ChainsqlTest.java b/chainsql/src/test/java/com/peersafe/chainsql/core/ChainsqlTest.java
@@ -39,14 +39,14 @@ public class ChainsqlTest extends TestCase {
 
 
     public void setUp() throws Exception {
-//        try{
-//           c.connect("ws://192.168.29.69:16006");
-//           c.as(rootAddress, rootSecret);
-//        }catch (Exception e){
-//            c.disconnect();
-//            e.printStackTrace();
-//            Assert.fail();
-//        }
+        try{
+           c.connect("ws://localhost:6006");
+           c.as(rootAddress, rootSecret);
+        }catch (Exception e){
+            c.disconnect();
+            e.printStackTrace();
+            Assert.fail();
+        }
     }
 
     public void tearDown() throws Exception {
@@ -457,6 +457,24 @@ public void testModifySchema() {
 
     }
 
+    public void testDeleteSchema() {
+
+        try{
+            String schemaID = "B4BC6A49F5A64AE0F4AA205DB92C2AD85EEE67F7D5977C83DB6D16F00A8FA08D";
+             // SchemaOpType
+            JSONObject obj =  c.deleteSchema(schemaID).submit(Submit.SyncCond.validate_success);
+
+            System.out.println(obj);
+
+        }catch (Exception e){
+
+            e.printStackTrace();
+            Assert.fail();
+        }
+
+    }
+
+    
     public  void testGetSchemaList(){
         try{
 
