Merge pull request EOSIO#131 from enumivo/staging

merge eosio master
bithacks-tech · May 18, 2018 · 89942b4 · 89942b4
2 parents d1fd6e8 + c4d225f
commit 89942b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,7 +8,7 @@ pipeline {
                     steps {
                         sh '''
                             . $HOME/.bash_profile
-                            echo 1 | ./eosio_build.sh
+                            echo 1 | ./enumivo_build.sh
                         '''
                         stash includes: 'build/**/*', name: 'buildUbuntu'
                     }
@@ -18,7 +18,7 @@ pipeline {
                     steps {
                         sh '''
                             . $HOME/.bash_profile
-                            echo 1 | ./eosio_build.sh
+                            echo 1 | ./enumivo_build.sh
                         '''
                         stash includes: 'build/**/*', name: 'buildMacOS'
                     }
@@ -28,7 +28,7 @@ pipeline {
                     steps {
                         sh '''
                             . $HOME/.bash_profile
-                            echo 1 | ./eosio_build.sh
+                            echo 1 | ./enumivo_build.sh
                         '''
                         stash includes: 'build/**/*', name: 'buildFedora'
                     }
@@ -56,7 +56,7 @@ pipeline {
                     post {
                         failure {
                             archiveArtifacts 'build/genesis.json'
-                            archiveArtifacts 'build/etc/eosio/node_00/config.ini'
+                            archiveArtifacts 'build/etc/enumivo/node_00/config.ini'
                             archiveArtifacts 'build/var/lib/node_00/stderr.txt'
                             archiveArtifacts 'build/test_walletd_output.log'
                         }
@@ -78,7 +78,7 @@ pipeline {
                     post {
                         failure {
                             archiveArtifacts 'build/genesis.json'
-                            archiveArtifacts 'build/etc/eosio/node_00/config.ini'
+                            archiveArtifacts 'build/etc/enumivo/node_00/config.ini'
                             archiveArtifacts 'build/var/lib/node_00/stderr.txt'
                             archiveArtifacts 'build/test_walletd_output.log'
                         }
@@ -103,7 +103,7 @@ pipeline {
                     post {
                         failure {
                             archiveArtifacts 'build/genesis.json'
-                            archiveArtifacts 'build/etc/eosio/node_00/config.ini'
+                            archiveArtifacts 'build/etc/enumivo/node_00/config.ini'
                             archiveArtifacts 'build/var/lib/node_00/stderr.txt'
                             archiveArtifacts 'build/test_walletd_output.log'
                         }

diff --git a/libraries/chain/resource_limits.cpp b/libraries/chain/resource_limits.cpp
@@ -170,8 +170,8 @@ void resource_limits_manager::verify_account_ram_usage( const account_name accou
 
    if( ram_bytes >= 0 ) {
       ENU_ASSERT( usage.ram_usage <= ram_bytes, ram_usage_exceeded,
-                  "account ${account} has insufficient ram bytes; needs ${available} has ${needs}",
-                  ("account", account)("available",usage.ram_usage)("needs",ram_bytes)              );
+                  "account ${account} has insufficient ram; needs ${needs} bytes has ${available} bytes",
+                  ("account", account)("needs",usage.ram_usage)("available",ram_bytes)              );
    }
 }