Rename packages, classes etc to EthSigner (from EthFirewall) (Consens…

…ys#21)
Errorific · Apr 11, 2019 · 26b47dc · 26b47dc
1 parent 4b1a27d
commit 26b47dc
Show file tree

Hide file tree

Showing 64 changed files with 241 additions and 408 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -52,20 +52,20 @@ try {
             if (previousResult != null && (previousResult == 'FAILURE' || previousResult == 'UNSTABLE')) {
                 slackSend(
                     color: 'good',
-                    message: "EthFirewall branch ${env.BRANCH_NAME} build is back to HEALTHY.\nBuild Number: #${env.BUILD_NUMBER}\n${env.BUILD_URL}",
+                    message: "EthSigner branch ${env.BRANCH_NAME} build is back to HEALTHY.\nBuild Number: #${env.BUILD_NUMBER}\n${env.BUILD_URL}",
                     channel: channel
                 )
             }
         } else if (currentBuild.result == 'FAILURE') {
             slackSend(
                 color: 'danger',
-                message: "EthFirewall branch ${env.BRANCH_NAME} build is FAILING.\nBuild Number: #${env.BUILD_NUMBER}\n${env.BUILD_URL}",
+                message: "EthSigner branch ${env.BRANCH_NAME} build is FAILING.\nBuild Number: #${env.BUILD_NUMBER}\n${env.BUILD_URL}",
                 channel: channel
             )
         } else if (currentBuild.result == 'UNSTABLE') {
             slackSend(
                 color: 'warning',
-                message: "EthFirewall branch ${env.BRANCH_NAME} build is UNSTABLE.\nBuild Number: #${env.BUILD_NUMBER}\n${env.BUILD_URL}",
+                message: "EthSigner branch ${env.BRANCH_NAME} build is UNSTABLE.\nBuild Number: #${env.BUILD_NUMBER}\n${env.BUILD_URL}",
                 channel: channel
             )
         }

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# EthFirewall
+# EthSigner
 
-A transaction signing and firewall application to be used with a web3 provider.
+A transaction signing application to be used with a web3 provider.
 
-[EthFirewall Command Line Options](docs/Reference/EthFirewall-CLI.md)
+[EthSigner Command Line Options](docs/Reference/EthSigner-CLI.md)
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ plugins {
   id 'net.researchgate.release' version '2.7.0'
 }
 
-group = 'tech.pegasys.ethfirewall'
+group = 'tech.pegasys.ethsigner'
 
 defaultTasks 'build', 'checkLicenses', 'javadoc'
 
@@ -163,7 +163,7 @@ allprojects {
    * The properties passed are:
    * - 'test.ethereum.include': allows to run a single Ethereum reference tests. For instance,
    *   running a single general state test can be done with:
-   *    ./gradlew :ethereum:tech.pegasys.ethfirewall.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.include=callcodecallcallcode_101-Frontier
+   *    ./gradlew :ethereum:tech.pegasys.ethsigner.ethereum.vm:test -Dtest.single=GeneralStateTest -Dtest.ethereum.include=callcodecallcallcode_101-Frontier
    *   The meaning being that will be run only the tests for which the value passed as "include"
    *   (which can be a java pattern) matches parts of the test name. Knowing that tests names for
    *   reference tests are of the form:
@@ -257,7 +257,7 @@ subprojects {
 
   task integrationTest(type: Test, dependsOn:["compileTestJava"]){
     group = "verification"
-    description = "Runs the Ethfirewall integration tests"
+    description = "Runs the EthSigner integration tests"
 
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
@@ -290,7 +290,7 @@ subprojects {
 jar { enabled = false }
 
 apply plugin: 'application'
-mainClassName = "tech.pegasys.ethfirewall.EthFirewall"
+mainClassName = "tech.pegasys.ethsigner.EthSigner"
 applicationDefaultJvmArgs = [
   "-Dvertx.disableFileCPResolving=true",
   // We shutdown log4j ourselves, as otherwise his shutdown hook runs before our own and whatever
@@ -299,9 +299,9 @@ applicationDefaultJvmArgs = [
 ]
 
 run {
-  args project.hasProperty("ethfirewall.run.args") ? project.property("ethfirewall.run.args").toString().split("\\s+") : []
+  args project.hasProperty("ethsigner.run.args") ? project.property("ethsigner.run.args").toString().split("\\s+") : []
   doFirst {
-    applicationDefaultJvmArgs = applicationDefaultJvmArgs.collect{it.replace('ETHFIREWALL_HOME', "$buildDir/ethfirewall")}
+    applicationDefaultJvmArgs = applicationDefaultJvmArgs.collect{it.replace('ETHSIGNER_HOME', "$buildDir/ethsigner")}
   }
 }
 
@@ -312,8 +312,8 @@ startScripts {
   }
 
   doLast {
-    unixScript.text = unixScript.text.replace('ETHFIREWALL_HOME', '\$APP_HOME')
-    windowsScript.text = windowsScript.text.replace('ETHFIREWALL_HOME', '%~dp0..')
+    unixScript.text = unixScript.text.replace('ETHSIGNER_HOME', '\$APP_HOME')
+    windowsScript.text = windowsScript.text.replace('ETHSIGNER_HOME', '%~dp0..')
 
     // Prevent the error originating from the 8191 chars limit on Windows
     windowsScript.text =
@@ -325,7 +325,7 @@ startScripts {
 }
 
 dependencies {
-  compile project(':ethfirewall')
+  compile project(':ethsigner')
   errorprone 'com.google.errorprone:error_prone_core'
 }
 
@@ -468,12 +468,12 @@ bintray {
 
   pkg {
     repo = 'pegasys-repo'
-    name = 'ethfirewall'
+    name = 'ethsigner'
     userOrg = 'consensys'
     licenses = ['Apache-2.0']
-    websiteUrl = 'https://github.com/PegaSysEng/ethfirewall'
-    issueTrackerUrl = 'https://github.com/PegaSysEng/ethfirewall/issues'
-    vcsUrl = 'https://github.com/PegaSysEng/ethfirewall.git'
+    websiteUrl = 'https://github.com/PegaSysEng/ethsigner'
+    issueTrackerUrl = 'https://github.com/PegaSysEng/ethsigner/issues'
+    vcsUrl = 'https://github.com/PegaSysEng/ethsigner.git'
 
     version {
       name = project.version

diff --git a/docs/Reference/EthFirewall-CLI.md b/docs/Reference/EthFirewall-CLI.md
diff --git a/ethfirewall/build.gradle → ethsigner/build.gradle b/ethfirewall/build.gradle → ethsigner/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java-library'
 
 jar {
-  baseName 'ethfirewall'
+  baseName 'ethsigner'
   manifest {
     attributes(
       'Specification-Title': baseName,

diff --git a/...nrpcproxy/EthAccountsIntegrationTest.java → ...nrpcproxy/EthAccountsIntegrationTest.java b/...nrpcproxy/EthAccountsIntegrationTest.java → ...nrpcproxy/EthAccountsIntegrationTest.java
@@ -10,12 +10,12 @@
  * 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 tech.pegasys.ethfirewall.jsonrpcproxy;
+package tech.pegasys.ethsigner.jsonrpcproxy;
 
 import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 
-import tech.pegasys.ethfirewall.jsonrpc.response.JsonRpcSuccessResponse;
+import tech.pegasys.ethsigner.jsonrpc.response.JsonRpcSuccessResponse;
 
 import java.util.Map;
 
@@ -38,7 +38,7 @@ public void ethAccountsRequestFromWeb3jRespondsWithNodesAddress() {
         new JsonRpcSuccessResponse(requestBody.getId(), singletonList(unlockedAccount));
 
     sendRequestThenVerifyResponse(
-        request.ethFirewall(Json.encode(requestBody)),
-        response.ethFirewall(expectedHeaders, Json.encode(responseBody)));
+        request.ethSigner(Json.encode(requestBody)),
+        response.ethSigner(expectedHeaders, Json.encode(responseBody)));
   }
 }
diff --git a/...xy/EthFirewallParsingIntegrationTest.java → ...roxy/EthSignerParsingIntegrationTest.java b/...xy/EthFirewallParsingIntegrationTest.java → ...roxy/EthSignerParsingIntegrationTest.java
@@ -10,19 +10,19 @@
  * 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 tech.pegasys.ethfirewall.jsonrpcproxy;
+package tech.pegasys.ethsigner.jsonrpcproxy;
 
-import static tech.pegasys.ethfirewall.jsonrpc.response.JsonRpcError.PARSE_ERROR;
+import static tech.pegasys.ethsigner.jsonrpc.response.JsonRpcError.PARSE_ERROR;
 
 import org.junit.Test;
 
-public class EthFirewallParsingIntegrationTest extends IntegrationTestBase {
+public class EthSignerParsingIntegrationTest extends IntegrationTestBase {
 
   private static final Object NO_ID = null;
 
   @Test
   public void parseErrorResponseWhenJsonRequestIsMalformed() {
     sendRequestThenVerifyResponse(
-        request.ethFirewall(MALFORMED_JSON), response.ethFirewall(NO_ID, PARSE_ERROR));
+        request.ethSigner(MALFORMED_JSON), response.ethSigner(NO_ID, PARSE_ERROR));
   }
 }