Merge branch 'plugin-dev'

duuuut · Jul 6, 2023 · dcc8c9d · dcc8c9d
2 parents 60200f5 + 9035e15
commit dcc8c9d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/darc-protocol/contracts/protocol/Plugin/EnumConditionExpression.sol b/darc-protocol/contracts/protocol/Plugin/EnumConditionExpression.sol
@@ -142,7 +142,7 @@ enum EnumConditionExpression{
    *  2. transfering tokens to address is in address array
    * params: address[] fromAddressArray
    */
-  TRASNFER_TOKEN_FROM,
+  TRANSFER_TOKEN_FROM,
 
   /**
    * This condition expression will be ture if:

diff --git a/darc-protocol/test/operationUnitTest/batch_transfer_tokens.ts b/darc-protocol/test/operationUnitTest/batch_transfer_tokens.ts
@@ -22,7 +22,7 @@ function containsAddr(array: string[], addr:string): boolean {
 }
 
 
-describe("batch_trasnfer_tokens_test", function () {
+describe("batch_transfer_tokens_test", function () {
 
 
   it ("should transfer tokens", async function () {

diff --git a/darc-protocol/test/operationUnitTest/batch_transfer_tokens_from_to.ts b/darc-protocol/test/operationUnitTest/batch_transfer_tokens_from_to.ts
@@ -23,10 +23,10 @@ function containsAddr(array: string[], addr:string): boolean {
 }
 
 
-describe("batch_trasnfer_tokens_from_to_test", function () {
+describe("batch_transfer_tokens_from_to_test", function () {
 
 
-  it ("should trasnfer tokens (from-to) tokens", async function () {
+  it ("should transfer tokens (from-to) tokens", async function () {
 
     const DARC = await ethers.getContractFactory("DARC");
     const darc = await DARC.deploy();
@@ -166,7 +166,7 @@ describe("batch_trasnfer_tokens_from_to_test", function () {
     expect(containsAddr(await darc.getTokenOwners(0), target3)).to.equal(false);
     expect(containsAddr(await darc.getTokenOwners(1), target3)).to.equal(false);
 
-    // trasnfer tokens from target 1 to addr 6 multiple times and make sure that 
+    // transfer tokens from target 1 to addr 6 multiple times and make sure that 
     // 1. the balance of target 1 and addr6 are correct
     // 2. the token owner list of level 0 and 1 are correct
     await darc.entrance({
-Original file line number
+Diff line change
@@ Expand Up @@
     }
-    describe("batch_trasnfer_tokens_test", function () {
+    describe("batch_transfer_tokens_test", function () {
       it ("should transfer tokens", async function () {
@@ Expand Down @@