Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Chiguireitor
addrindexrs
Commits
0d56b2ec
Unverified
Commit
0d56b2ec
authored
May 25, 2018
by
Roman Zeyde
Browse files
Use one error_chain definition
parent
a30f492d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
15 deletions
+15
-15
src/app.rs
src/app.rs
+4
-6
src/daemon.rs
src/daemon.rs
+1
-1
src/errors.rs
src/errors.rs
+5
-0
src/lib.rs
src/lib.rs
+1
-0
src/mempool.rs
src/mempool.rs
+1
-1
src/query.rs
src/query.rs
+2
-6
src/rpc.rs
src/rpc.rs
+1
-1
No files found.
src/app.rs
View file @
0d56b2ec
...
...
@@ -11,7 +11,7 @@ use std::time::Duration;
use
daemon
::
Network
;
use
{
daemon
,
index
,
query
,
rpc
,
store
};
error
_chain!
{}
use
error
s
::
*
;
#[derive(Debug)]
struct
Config
{
...
...
@@ -83,7 +83,7 @@ impl App {
&
self
.daemon
}
fn
update_index
(
&
self
,
mut
tip
:
Sha256dHash
)
->
Result
<
Sha256dHash
>
{
if
tip
!=
self
.daemon
.getbestblockhash
()
.chain_err
(||
"daemon error"
)
?
{
if
tip
!=
self
.daemon
.getbestblockhash
()
?
{
tip
=
self
.index
.update
(
&
self
.store
,
&
self
.daemon
);
}
Ok
(
tip
)
...
...
@@ -92,7 +92,7 @@ impl App {
fn
run_server
(
config
:
&
Config
)
->
Result
<
()
>
{
let
index
=
index
::
Index
::
new
();
let
daemon
=
daemon
::
Daemon
::
new
(
config
.network_type
)
.chain_err
(||
"cannot connect to daemon"
)
?
;
let
daemon
=
daemon
::
Daemon
::
new
(
config
.network_type
)
?
;
let
store
=
store
::
DBStore
::
open
(
config
.db_path
,
...
...
@@ -117,9 +117,7 @@ fn run_server(config: &Config) -> Result<()> {
rpc
::
start
(
&
config
.rpc_addr
,
query
.clone
());
loop
{
thread
::
sleep
(
poll_delay
);
query
.update_mempool
()
.chain_err
(||
"mempool update failed"
)
?
;
query
.update_mempool
()
?
;
tip
=
app
.update_index
(
tip
)
?
;
}
}
...
...
src/daemon.rs
View file @
0d56b2ec
...
...
@@ -13,7 +13,7 @@ use std::net::TcpStream;
use
util
::{
HeaderList
,
HeaderMap
};
error
_chain!
{}
use
error
s
::
*
;
#[derive(Debug,
Copy,
Clone)]
pub
enum
Network
{
...
...
src/errors.rs
0 → 100644
View file @
0d56b2ec
error_chain!
{
types
{
Error
,
ErrorKind
,
ResultExt
,
Result
;
}
}
src/lib.rs
View file @
0d56b2ec
...
...
@@ -27,6 +27,7 @@ extern crate serde_json;
pub
mod
app
;
mod
daemon
;
mod
errors
;
mod
index
;
mod
mempool
;
mod
query
;
...
...
src/mempool.rs
View file @
0d56b2ec
...
...
@@ -12,7 +12,7 @@ use index::index_transaction;
use
store
::{
ReadStore
,
Row
};
use
util
::
Bytes
;
error
_chain!
{}
use
error
s
::
*
;
const
VSIZE_BIN_WIDTH
:
u32
=
100_000
;
// in vbytes
...
...
src/query.rs
View file @
0d56b2ec
...
...
@@ -13,7 +13,7 @@ use mempool::Tracker;
use
store
::
ReadStore
;
use
util
::{
FullHash
,
HashPrefix
,
HeaderEntry
};
error
_chain!
{}
use
error
s
::
*
;
struct
FundingOutput
{
txn_id
:
Sha256dHash
,
...
...
@@ -308,11 +308,7 @@ impl Query {
}
pub
fn
update_mempool
(
&
self
)
->
Result
<
()
>
{
self
.tracker
.write
()
.unwrap
()
.update
(
self
.app
.daemon
())
.chain_err
(||
"failed to update mempool"
)
self
.tracker
.write
()
.unwrap
()
.update
(
self
.app
.daemon
())
}
/// Returns [vsize, fee_rate] pairs (measured in vbytes and satoshis).
...
...
src/rpc.rs
View file @
0d56b2ec
...
...
@@ -16,7 +16,7 @@ use std::time::Duration;
use
query
::
Query
;
use
util
::
HeaderEntry
;
error
_chain!
{}
use
error
s
::
*
;
// TODO: Sha256dHash should be a generic hash-container (since script hash is single SHA256)
fn
hash_from_value
(
val
:
Option
<&
Value
>
)
->
Result
<
Sha256dHash
>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment