diff --git a/actuator/src/main/java/org/tron/core/actuator/MarketCancelOrderActuator.java b/actuator/src/main/java/org/tron/core/actuator/MarketCancelOrderActuator.java index 31b5e87e12d..d4260e38163 100644 --- a/actuator/src/main/java/org/tron/core/actuator/MarketCancelOrderActuator.java +++ b/actuator/src/main/java/org/tron/core/actuator/MarketCancelOrderActuator.java @@ -43,7 +43,6 @@ import org.tron.protos.Protocol.MarketOrder.State; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.Protocol.Transaction.Result.code; -import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.MarketContract.MarketCancelOrderContract; @Slf4j(topic = "actuator") @@ -221,7 +220,7 @@ public boolean validate() throws ContractValidateException { @Override public ByteString getOwnerAddress() throws InvalidProtocolBufferException { - return any.unpack(AssetIssueContract.class).getOwnerAddress(); + return any.unpack(MarketCancelOrderContract.class).getOwnerAddress(); } @Override diff --git a/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java b/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java index d196cdef06f..369857ae6c1 100644 --- a/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java +++ b/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java @@ -54,7 +54,6 @@ import org.tron.protos.Protocol.MarketPrice; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.Protocol.Transaction.Result.code; -import org.tron.protos.contract.AssetIssueContractOuterClass.AssetIssueContract; import org.tron.protos.contract.MarketContract.MarketSellAssetContract; @Slf4j(topic = "actuator") @@ -283,7 +282,7 @@ public boolean validate() throws ContractValidateException { @Override public ByteString getOwnerAddress() throws InvalidProtocolBufferException { - return any.unpack(AssetIssueContract.class).getOwnerAddress(); + return any.unpack(MarketSellAssetContract.class).getOwnerAddress(); } @Override diff --git a/actuator/src/main/java/org/tron/core/actuator/UpdateAssetActuator.java b/actuator/src/main/java/org/tron/core/actuator/UpdateAssetActuator.java index 193d352a72d..36ec42cb8ba 100644 --- a/actuator/src/main/java/org/tron/core/actuator/UpdateAssetActuator.java +++ b/actuator/src/main/java/org/tron/core/actuator/UpdateAssetActuator.java @@ -17,7 +17,6 @@ import org.tron.core.utils.TransactionUtil; import org.tron.protos.Protocol.Transaction.Contract.ContractType; import org.tron.protos.Protocol.Transaction.Result.code; -import org.tron.protos.contract.AccountContract.AccountUpdateContract; import org.tron.protos.contract.AssetIssueContractOuterClass.UpdateAssetContract; @Slf4j(topic = "actuator") @@ -171,7 +170,7 @@ public boolean validate() throws ContractValidateException { @Override public ByteString getOwnerAddress() throws InvalidProtocolBufferException { - return any.unpack(AccountUpdateContract.class).getOwnerAddress(); + return any.unpack(UpdateAssetContract.class).getOwnerAddress(); } @Override diff --git a/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java index 4c6b7b58b89..d2ec8c30994 100644 --- a/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/MarketCancelOrderActuatorTest.java @@ -2,6 +2,7 @@ import com.google.protobuf.Any; import com.google.protobuf.ByteString; +import com.google.protobuf.InvalidProtocolBufferException; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; @@ -759,4 +760,14 @@ public void onlyOneOrderAtThisPriceAndHasOnlyOnePrice() throws Exception { Assert.assertNull(orderIdListCapsule); } + + @Test + public void testGetOwnerAddress() throws InvalidProtocolBufferException { + MarketCancelOrderActuator actuator = new MarketCancelOrderActuator(); + actuator.setChainBaseManager(dbManager.getChainBaseManager()) + .setAny(getContract(OWNER_ADDRESS_FIRST, ByteString.copyFromUtf8("orderId"))); + + Assert.assertEquals(OWNER_ADDRESS_FIRST, + ByteArray.toHexString(actuator.getOwnerAddress().toByteArray())); + } } \ No newline at end of file diff --git a/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java index 2789f261fd1..c8eb2e66686 100644 --- a/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/MarketSellAssetActuatorTest.java @@ -4,6 +4,7 @@ import com.google.protobuf.Any; import com.google.protobuf.ByteString; +import com.google.protobuf.InvalidProtocolBufferException; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.junit.After; @@ -1871,4 +1872,14 @@ public void exceedMaxMatchNumLimit() throws Exception { } } + @Test + public void testGetOwnerAddress() throws InvalidProtocolBufferException { + MarketSellAssetActuator actuator = new MarketSellAssetActuator(); + actuator.setChainBaseManager(dbManager.getChainBaseManager()) + .setAny(getContract(OWNER_ADDRESS_FIRST, "sellToken", 100L, "buyToken", 200L)); + + Assert.assertEquals(OWNER_ADDRESS_FIRST, + ByteArray.toHexString(actuator.getOwnerAddress().toByteArray())); + } + } \ No newline at end of file diff --git a/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java b/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java index 1c17b3873c4..45a956b59f3 100644 --- a/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java +++ b/framework/src/test/java/org/tron/core/actuator/UpdateAssetActuatorTest.java @@ -4,6 +4,7 @@ import com.google.protobuf.Any; import com.google.protobuf.ByteString; +import com.google.protobuf.InvalidProtocolBufferException; import java.util.Date; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; @@ -488,4 +489,14 @@ public void commonErrorCheck() { actuatorTest.nullDBManger(); } + @Test + public void testGetOwnerAddress() throws InvalidProtocolBufferException { + UpdateAssetActuator actuator = new UpdateAssetActuator(); + actuator.setChainBaseManager(dbManager.getChainBaseManager()) + .setAny(getContract(OWNER_ADDRESS, DESCRIPTION, URL, 500L, 8000L)); + + Assert.assertEquals(OWNER_ADDRESS, + ByteArray.toHexString(actuator.getOwnerAddress().toByteArray())); + } + }