Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix audi publish #1618

Merged
merged 5 commits into from
May 18, 2023
Merged

Fix audi publish #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29f4691
clang-format
turuslan May 17, 2023
f67c148
empty bootstrap
turuslan May 17, 2023
98ccdd7
all addresses
turuslan May 17, 2023
dec31b2
fix test
turuslan May 17, 2023
16dd867
Merge remote-tracking branch 'origin/master' into fix/audi_publish
turuslan May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/authority_discovery/publisher/address_publisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ namespace kagome::authority_discovery {
}

outcome::result<void> AddressPublisher::publishOwnAddress() {
auto addresses = host_.getAddresses();
auto addresses = host_.getPeerInfo().addresses;
// TODO(turuslan): #1357, filter local addresses
if (addresses.empty()) {
SL_ERROR(log_, "No listening addresses");
Expand Down
27 changes: 13 additions & 14 deletions core/network/impl/peer_manager_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ namespace {

template <typename P, typename F>
bool openOutgoing(std::shared_ptr<kagome::network::StreamEngine> &se,
std::shared_ptr<P> const &protocol,
kagome::network::PeerManager::PeerInfo const &pi,
const std::shared_ptr<P> &protocol,
const kagome::network::PeerManager::PeerInfo &pi,
F &&func) {
BOOST_ASSERT(se);
BOOST_ASSERT(protocol);
Expand Down Expand Up @@ -120,7 +120,6 @@ namespace kagome::network {
log_->critical(
"Does not have any bootstrap nodes. "
"Provide them by chain spec or CLI argument `--bootnodes'");
return false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 have we started consider this ok?

}

return true;
Expand Down Expand Up @@ -255,7 +254,7 @@ namespace kagome::network {

void PeerManagerImpl::setCollating(
const PeerId &peer_id,
network::CollatorPublicKey const &collator_id,
const network::CollatorPublicKey &collator_id,
network::ParachainId para_id) {
if (auto it = peer_states_.find(peer_id); it != peer_states_.end()) {
it->second.collator_state =
Expand All @@ -272,7 +271,7 @@ namespace kagome::network {
}

outcome::result<
std::pair<network::CollatorPublicKey const &, network::ParachainId>>
std::pair<const network::CollatorPublicKey &, network::ParachainId>>
PeerManagerImpl::retrieveCollatorData(
PeerState &peer_state, const primitives::BlockHash &relay_parent) {
if (!peer_state.collator_state) {
Expand Down Expand Up @@ -300,15 +299,15 @@ namespace kagome::network {
std::vector<ItemType> peers_list;
peers_list.reserve(active_peers_.size());

uint64_t const now_ms =
const uint64_t now_ms =
std::chrono::time_point_cast<std::chrono::milliseconds>(clock_->now())
.time_since_epoch()
.count();
uint64_t const idle_ms =
const uint64_t idle_ms =
std::chrono::duration_cast<std::chrono::milliseconds>(peer_ttl).count();

for (const auto &[peer_id, desc] : active_peers_) {
uint64_t const last_activity_ms =
const uint64_t last_activity_ms =
std::chrono::time_point_cast<std::chrono::milliseconds>(
desc.time_point)
.time_since_epoch()
Expand All @@ -333,7 +332,7 @@ namespace kagome::network {

std::sort(peers_list.begin(),
peers_list.end(),
[](auto const &l, auto const &r) { return r.first < l.first; });
[](const auto &l, const auto &r) { return r.first < l.first; });

for (; !peers_list.empty()
&& (peers_list.size() > hard_limit
Expand Down Expand Up @@ -585,8 +584,8 @@ namespace kagome::network {

template <typename F>
void PeerManagerImpl::openBlockAnnounceProtocol(
PeerInfo const &peer_info,
libp2p::network::ConnectionManager::ConnectionSPtr const &connection,
const PeerInfo &peer_info,
const libp2p::network::ConnectionManager::ConnectionSPtr &connection,
F &&opened_callback) {
auto block_announce_protocol = router_->getBlockAnnounceProtocol();
BOOST_ASSERT_MSG(block_announce_protocol,
Expand Down Expand Up @@ -665,7 +664,7 @@ namespace kagome::network {
}
}

void PeerManagerImpl::tryOpenGrandpaProtocol(PeerInfo const &peer_info,
void PeerManagerImpl::tryOpenGrandpaProtocol(const PeerInfo &peer_info,
PeerState &r_info) {
if (auto o_info_opt = getPeerState(own_peer_info_.id);
o_info_opt.has_value()) {
Expand All @@ -683,7 +682,7 @@ namespace kagome::network {
}
}

void PeerManagerImpl::tryOpenValidationProtocol(PeerInfo const &peer_info,
void PeerManagerImpl::tryOpenValidationProtocol(const PeerInfo &peer_info,
PeerState &peer_state) {
/// If validator start validation protocol
if (peer_state.roles.flags.authority) {
Expand Down Expand Up @@ -786,7 +785,7 @@ namespace kagome::network {
peer_info,
connection,
[](std::shared_ptr<PeerManagerImpl> &self,
PeerInfo const &peer_info,
const PeerInfo &peer_info,
std::optional<std::reference_wrapper<PeerState>> peer_state) {
if (peer_state.has_value()) {
self->tryOpenGrandpaProtocol(peer_info, peer_state.value().get());
Expand Down
13 changes: 10 additions & 3 deletions test/core/authority_discovery/address_publisher_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ using libp2p::HostMock;
using libp2p::basic::SchedulerMock;
using libp2p::crypto::marshaller::KeyMarshallerMock;
using libp2p::multi::Multiaddress;
using libp2p::peer::PeerId;
using libp2p::peer::PeerInfo;
using libp2p::protocol::kademlia::KademliaMock;
using testing::_;
using testing::Return;
Expand All @@ -53,7 +55,8 @@ struct AddressPublisherTest : public testing::Test {
libp2p_key_.privateKey.type = libp2p::crypto::Key::Type::Ed25519;
libp2p_key_.privateKey.data.resize(Ed25519PrivateKey::size());
libp2p_key_.publicKey.data.resize(Ed25519PublicKey::size());
addresses_.push_back(Multiaddress::create("/ip4/127.0.0.1").value());
peer_info_.addresses.push_back(
Multiaddress::create("/ip4/127.0.0.1").value());

EXPECT_CALL(*app_state_manager_, atLaunch(_));
EXPECT_CALL(*key_marshaller_, marshal(libp2p_key_.publicKey))
Expand Down Expand Up @@ -95,7 +98,11 @@ struct AddressPublisherTest : public testing::Test {
std::shared_ptr<SchedulerMock> scheduler_ = std::make_shared<SchedulerMock>();
std::shared_ptr<CryptoStoreMock> crypto_store_ =
std::make_shared<CryptoStoreMock>();
std::vector<Multiaddress> addresses_;
PeerInfo peer_info_{
PeerId::fromBase58("12D3KooWGYLoNGrZn2nwewBiPFZuKHZebPDL9QAF26cVgLxwuiTZ")
.value(),
{}};

Sr25519PublicKey audi_key_;
std::shared_ptr<AddressPublisher> publisher_;
};
Expand All @@ -106,7 +113,7 @@ struct AddressPublisherTest : public testing::Test {
* @then success
*/
TEST_F(AddressPublisherTest, Success) {
EXPECT_CALL(*host_, getAddresses()).WillOnce(Return(addresses_));
EXPECT_CALL(*host_, getPeerInfo()).WillOnce(Return(peer_info_));
EXPECT_CALL(*crypto_store_, getSr25519PublicKeys(_))
.WillOnce(Return(std::vector{audi_key_}));
EXPECT_CALL(*crypto_store_, findSr25519Keypair(_, _))
Expand Down