Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rustyrussell/pettycoin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ffedf2619172
Choose a base ref
...
head repository: rustyrussell/pettycoin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8fe6c6624cd2
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 16, 2014

  1. recv_block.h: remove seek_detached_blocks() prototype. 

    It's also in detached_block.h where it belongs.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    @rustyrussell
    rustyrussell committed Sep 16, 2014
    Copy the full SHA
    bdca104 View commit details

  2. recv_block: don't segv on generation or json inject. 

    Introduced in 6851d62.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    @rustyrussell
    rustyrussell committed Sep 16, 2014
    Copy the full SHA
    8fe6c66 View commit details
Showing with 2 additions and 5 deletions.
  1. +1 −0 block.c
  2. +1 −1 recv_block.c
  3. +0 −4 recv_block.h
1 change: 1 addition & 0 deletions block.c
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
#include "blockfile.h"
#include "chain.h"
#include "check_block.h"
#include "detached_block.h"
#include "difficulty.h"
#include "features.h"
#include "generating.h"
2 changes: 1 addition & 1 deletion recv_block.c
View file
Original file line number Diff line number Diff line change
@@ -229,7 +229,7 @@ recv_block_pkt(struct state *state, struct log *log, struct peer *peer,
return e;
}

return recv_block(state, log, peer, pkt, &bi, peer->we_are_syncing, block);
return recv_block(state, log, peer, pkt, &bi, peer ? peer->we_are_syncing : false, block);
}

static struct txptr_with_ref
4 changes: 0 additions & 4 deletions recv_block.h
View file
Original file line number Diff line number Diff line change
@@ -31,10 +31,6 @@ bool try_resolve_hash(struct state *state,
const struct peer *source,
struct block *block, u16 shardnum, u8 txoff);

/* A new block: see if it resolved any prev_block */
void seek_detached_blocks(struct state *state,
const struct block *block);

/* Ask about block contents (on startup and syncing) */
void get_block_contents(struct state *state, const struct block *b);
#endif /* PETTYCOIN_RECV_BLOCK_H */