forked from hyperledger/besu
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into nelson-gas-limit-fix
- Loading branch information
Showing
20 changed files
with
492 additions
and
242 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
besu/src/main/java/org/hyperledger/besu/cli/converter/PositiveNumberConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Copyright Hyperledger Besu Contributors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * 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. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.cli.converter; | ||
|
|
||
| import org.hyperledger.besu.cli.converter.exception.PercentageConversionException; | ||
| import org.hyperledger.besu.util.number.PositiveNumber; | ||
|
|
||
| import picocli.CommandLine; | ||
|
|
||
| /** The PositiveNumber Cli type converter. */ | ||
| public class PositiveNumberConverter implements CommandLine.ITypeConverter<PositiveNumber> { | ||
|
|
||
| @Override | ||
| public PositiveNumber convert(final String value) throws PercentageConversionException { | ||
| try { | ||
| return PositiveNumber.fromString(value); | ||
| } catch (NullPointerException | IllegalArgumentException e) { | ||
| throw new PercentageConversionException(value); | ||
| } | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
.../java/org/hyperledger/besu/cli/converter/exception/PositiveNumberConversionException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright Hyperledger Besu Contributors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * 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. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.cli.converter.exception; | ||
|
|
||
| import static java.lang.String.format; | ||
|
|
||
| /** The custom PositiveNumber conversion exception. */ | ||
| public final class PositiveNumberConversionException extends Exception { | ||
|
|
||
| /** | ||
| * Instantiates a new PositiveNumber conversion exception. | ||
| * | ||
| * @param value the invalid value to add in exception message | ||
| */ | ||
| public PositiveNumberConversionException(final String value) { | ||
| super(format("Invalid value: %s, should be a positive number >0.", value)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.