[taler-depolymerization] branch master updated (7e7e391 -> c8f70e9)

[gnunet]

This is an automated email from the git hooks/post-receive script.

antoine pushed a change to branch master
in repository depolymerization.

    from 7e7e391  Improve documentation
     new 95fa92c  btc-wire: less broken pipe
     new c8f70e9  eth-wire: fix TESTROPSTENETH currency name being too long

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 btc-wire/src/rpc.rs    | 4 ++--
 common/src/currency.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/btc-wire/src/rpc.rs b/btc-wire/src/rpc.rs
index b4cdf11..d5f945d 100644
--- a/btc-wire/src/rpc.rs
+++ b/btc-wire/src/rpc.rs
@@ -164,7 +164,7 @@ impl Rpc {
         T: serde::de::DeserializeOwned + Debug,
     {
         // Handle bitcoind RPC client timeout
-        if self.last_call.elapsed() > Duration::from_secs(60) {
+        if self.last_call.elapsed() > Duration::from_secs(30) {
             // Create new connection
             let sock = TcpStream::connect_timeout(&self.addr, 
Duration::from_secs(5))?;
             self.conn = BufReader::new(sock);
@@ -207,6 +207,7 @@ impl Rpc {
             if sep {
                 break;
             }
+            self.last_call = Instant::now();
         }
         // Read body
         let amount = sock.read_until(b'\n', buf)?;
@@ -229,7 +230,6 @@ impl Rpc {
             }
             RpcResponse::Error(msg) => Err(Error::Bitcoin(msg)),
         };
-        self.last_call = Instant::now();
         return result;
     }
 
diff --git a/common/src/currency.rs b/common/src/currency.rs
index 72e3f17..f2596ba 100644
--- a/common/src/currency.rs
+++ b/common/src/currency.rs
@@ -20,7 +20,7 @@ pub const MAIN_BTC: &str = "BITCOINBTC";
 pub const REGTEST_BTC: &str = "TESTBTC";
 pub const TESTNET_BTC: &str = "DEVBTC";
 pub const MAIN_ETH: &str = "ETHEREUMETH";
-pub const ROPSTEN_ETH: &str = "TESTROPSTENETH";
+pub const ROPSTEN_ETH: &str = "ROPSTENETH";
 pub const DEV_ETH: &str = "DEVETH";
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.