diff --git a/core/src/main/java/com/klaytn/caver/wallet/keyring/KeyringFactory.java b/core/src/main/java/com/klaytn/caver/wallet/keyring/KeyringFactory.java index feb418208..d64fb1449 100644 --- a/core/src/main/java/com/klaytn/caver/wallet/keyring/KeyringFactory.java +++ b/core/src/main/java/com/klaytn/caver/wallet/keyring/KeyringFactory.java @@ -101,7 +101,7 @@ public static String[] generateMultipleKeys(int num, String entropy) { * @param numArr An array containing the number of keys for each role. * @return List */ - public static List generateRolBasedKeys(int[] numArr) { + public static List generateRoleBasedKeys(int[] numArr) { return generateRoleBasedKeys(numArr, null); } diff --git a/core/src/main/java/com/klaytn/caver/wallet/keyring/wrapper/KeyringFactoryWrapper.java b/core/src/main/java/com/klaytn/caver/wallet/keyring/wrapper/KeyringFactoryWrapper.java index ebe58ca6e..b5b0e387c 100644 --- a/core/src/main/java/com/klaytn/caver/wallet/keyring/wrapper/KeyringFactoryWrapper.java +++ b/core/src/main/java/com/klaytn/caver/wallet/keyring/wrapper/KeyringFactoryWrapper.java @@ -91,8 +91,8 @@ public String[] generateMultipleKeys(int num, String entropy) { * @param numArr An array containing the number of keys for each role. * @return List */ - public List generateRolBasedKeys(int[] numArr) { - return KeyringFactory.generateRolBasedKeys(numArr); + public List generateRoleBasedKeys(int[] numArr) { + return KeyringFactory.generateRoleBasedKeys(numArr); } /** diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateTest.java index 7884d71b0..cad64f224 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateTest.java @@ -760,7 +760,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); account = Account.createWithAccountKeyFail(from); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateWithRatioTest.java index 9f5921a9b..286aa1e79 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateWithRatioTest.java @@ -874,7 +874,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); account = Account.createWithAccountKeyFail(from); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelTest.java index 5c8dacce3..65fc69bf8 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelTest.java @@ -547,7 +547,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelWithRatioTest.java index b7c72e5b3..ba38795c8 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelWithRatioTest.java @@ -692,7 +692,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringTest.java index c01b63a06..778780cfc 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringTest.java @@ -643,7 +643,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringWithRatioTest.java index 01ad7569f..ed0ebfb28 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringWithRatioTest.java @@ -802,7 +802,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployTest.java index 906deecac..b06bd23f8 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployTest.java @@ -873,7 +873,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployWithRatioTest.java index 609e3dd4b..f27c0d501 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployWithRatioTest.java @@ -1035,7 +1035,7 @@ public void before() { singleKeyring = caver.wallet.keyring.createWithSingleKey(feePayer, feePayerPrivateKey); multipleKeyring = caver.wallet.keyring.createWithMultipleKey(feePayer, caver.wallet.keyring.generateMultipleKeys(8)); - roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey(feePayer, caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5})); + roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey(feePayer, caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5})); } @Test diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionTest.java index a9bddf7a8..1c93fa005 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionTest.java @@ -824,7 +824,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionWithRatioTest.java index bac918dbd..207b9dcc9 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionWithRatioTest.java @@ -1010,7 +1010,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoTest.java index b93a2a04c..41faabeb5 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoTest.java @@ -794,7 +794,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoWithRatioTest.java index e150bae18..6a16e6be3 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoWithRatioTest.java @@ -12,7 +12,6 @@ import org.junit.experimental.runners.Enclosed; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; -import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -1053,7 +1052,7 @@ public void before() { singleKeyring = caver.wallet.keyring.createWithSingleKey(feePayer, feePayerPrivateKey); multipleKeyring = caver.wallet.keyring.createWithMultipleKey(feePayer, caver.wallet.keyring.generateMultipleKeys(8)); - roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey(feePayer, caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5})); + roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey(feePayer, caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5})); } @Test diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferTest.java index 0a6186a5f..5c9ab8017 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferTest.java @@ -766,7 +766,7 @@ public void before() { ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferWithRatioTest.java index 146f6b9d9..c0992e8d5 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferWithRatioTest.java @@ -928,7 +928,7 @@ public void before() { caver.wallet.keyring.generateMultipleKeys(8) ); roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey(feePayer, - caver.wallet.keyring.generateRolBasedKeys(new int[]{3, 4, 5}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{3, 4, 5}) ); } diff --git a/core/src/test/java/com/klaytn/caver/common/wallet/KeyringContainerTest.java b/core/src/test/java/com/klaytn/caver/common/wallet/KeyringContainerTest.java index 5d1da660d..79d81367f 100644 --- a/core/src/test/java/com/klaytn/caver/common/wallet/KeyringContainerTest.java +++ b/core/src/test/java/com/klaytn/caver/common/wallet/KeyringContainerTest.java @@ -558,7 +558,7 @@ public void keyringWithChecksumAddress() { RoleBasedKeyring roleBasedKeyring = caver.wallet.keyring.createWithRoleBasedKey( checksumAddress, - caver.wallet.keyring.generateRolBasedKeys(new int[]{2, 2, 1}) + caver.wallet.keyring.generateRoleBasedKeys(new int[]{2, 2, 1}) ); caver.wallet.add(roleBasedKeyring); caver.wallet.remove(multipleKeyring.getAddress());