Merge master (1.2.4) into develop (1.3.0-b2)

This commit is contained in:
Nik Bougalis
2019-04-26 10:42:51 -07:00
15 changed files with 543 additions and 257 deletions

View File

@@ -524,12 +524,12 @@ DatabaseShardImp::setStored(std::shared_ptr<Ledger const> const& ledger)
updateStats(lock);
// Update peers with new shard index
protocol::TMShardInfo message;
protocol::TMPeerShardInfo message;
PublicKey const& publicKey {app_.nodeIdentity().first};
message.set_nodepubkey(publicKey.data(), publicKey.size());
message.set_shardindexes(std::to_string(shardIndex));
app_.overlay().foreach(send_always(
std::make_shared<Message>(message, protocol::mtSHARD_INFO)));
std::make_shared<Message>(message, protocol::mtPEER_SHARD_INFO)));
}
}