Merge pull request #1945 from JayMaro/master

Move CipherException from org.web3j.crypto to org.web3j.crypto.exception

Author: gtebrean

core/src/main/java/org/web3j/crypto/Bip44WalletUtils.java

@@ -15,6 +15,8 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.web3j.crypto.exception.CipherException;
+
 import static org.web3j.crypto.Bip32ECKeyPair.HARDENED_BIT;
 
 public class Bip44WalletUtils extends WalletUtils {

core/src/main/java/org/web3j/crypto/Wallet.java

@@ -29,6 +29,7 @@
 import org.bouncycastle.crypto.generators.SCrypt;
 import org.bouncycastle.crypto.params.KeyParameter;
 
+import org.web3j.crypto.exception.CipherException;
 import org.web3j.utils.Numeric;
 
 import static java.nio.charset.StandardCharsets.UTF_8;

core/src/main/java/org/web3j/crypto/WalletUtils.java

@@ -26,6 +26,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.web3j.crypto.exception.CipherException;
 import org.web3j.utils.Numeric;
 
 import static org.web3j.crypto.Hash.sha256;

crypto/src/main/java/org/web3j/crypto/CipherException.java renamed to crypto/src/main/java/org/web3j/crypto/exception/CipherException.java

@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.web3j.crypto;
+package org.web3j.crypto.exception;
 
 /** Cipher exception wrapper. */
 public class CipherException extends Exception {