From 8f4c0a153fd377715c1a823c5caacd7ed31dd9b9 Mon Sep 17 00:00:00 2001 From: Alexey Chernyshov Date: Mon, 29 Nov 2021 10:16:32 +0300 Subject: [PATCH] fix stored_ask Signed-off-by: Alexey Chernyshov --- core/markets/storage/ask_protocol.hpp | 4 ++-- core/markets/storage/deal_protocol.hpp | 4 ++-- .../storage/provider/impl/stored_ask.cpp | 18 +++++++++--------- core/markets/storage/status_protocol.hpp | 4 ++-- .../storage/provider/stored_ask_test.cpp | 6 +----- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/core/markets/storage/ask_protocol.hpp b/core/markets/storage/ask_protocol.hpp index 6d8eb6f57b..206322eb4d 100644 --- a/core/markets/storage/ask_protocol.hpp +++ b/core/markets/storage/ask_protocol.hpp @@ -118,7 +118,7 @@ namespace fc::markets::storage { } outcome::result getDigest() const override { - return codec::cbor::encode(*this); + return codec::cbor::encode(StorageAskV1_0_1{this->ask}); }; private: @@ -151,7 +151,7 @@ namespace fc::markets::storage { } outcome::result getDigest() const override { - return codec::cbor::encode(*this); + return codec::cbor::encode(StorageAskV1_1_0{this->ask}); }; private: diff --git a/core/markets/storage/deal_protocol.hpp b/core/markets/storage/deal_protocol.hpp index 9be5ed3c35..c73bb393a7 100644 --- a/core/markets/storage/deal_protocol.hpp +++ b/core/markets/storage/deal_protocol.hpp @@ -390,7 +390,7 @@ namespace fc::markets::storage { } outcome::result getDigest() const override { - return codec::cbor::encode(*this); + return codec::cbor::encode(ResponseV1_0_1{this->response}); }; private: @@ -421,7 +421,7 @@ namespace fc::markets::storage { } outcome::result getDigest() const override { - return codec::cbor::encode(*this); + return codec::cbor::encode(ResponseV1_1_0{this->response}); }; private: diff --git a/core/markets/storage/provider/impl/stored_ask.cpp b/core/markets/storage/provider/impl/stored_ask.cpp index c4c8a52a3e..517ea3c57a 100644 --- a/core/markets/storage/provider/impl/stored_ask.cpp +++ b/core/markets/storage/provider/impl/stored_ask.cpp @@ -65,14 +65,14 @@ namespace fc::markets::storage::provider { OUTCOME_TRY(chain_head, api_->ChainHead()); ChainEpoch timestamp = chain_head->height(); ChainEpoch expiry = chain_head->height() + kDefaultDuration; - StorageAsk default_ask{.price = kDefaultPrice, - .verified_price = kDefaultPrice, - .min_piece_size = kDefaultMinPieceSize, - .max_piece_size = kDefaultMaxPieceSize, - .miner = actor_, - .timestamp = timestamp, - .expiry = expiry, - .seq_no = 0}; + StorageAskV1_1_0 default_ask{{.price = kDefaultPrice, + .verified_price = kDefaultPrice, + .min_piece_size = kDefaultMinPieceSize, + .max_piece_size = kDefaultMaxPieceSize, + .miner = actor_, + .timestamp = timestamp, + .expiry = expiry, + .seq_no = 0}}; OUTCOME_TRY(signed_ask, signAsk(default_ask, *chain_head)); return std::move(signed_ask); } @@ -93,7 +93,7 @@ namespace fc::markets::storage::provider { SignedStorageAskV1_1_0 signed_ask(ask); OUTCOME_TRY(digest, signed_ask.getDigest()); OUTCOME_TRYA(signed_ask.signature, api_->WalletSign(key_address, digest)); - return signed_ask; + return std::move(signed_ask); } } // namespace fc::markets::storage::provider diff --git a/core/markets/storage/status_protocol.hpp b/core/markets/storage/status_protocol.hpp index 5196326c31..f88960b03e 100644 --- a/core/markets/storage/status_protocol.hpp +++ b/core/markets/storage/status_protocol.hpp @@ -154,7 +154,7 @@ namespace fc::markets::storage { } outcome::result getDigest() const override { - return codec::cbor::encode(*this); + return codec::cbor::encode(ProviderDealStateV1_1_0{this->state}); }; private: @@ -187,7 +187,7 @@ namespace fc::markets::storage { } outcome::result getDigest() const override { - return codec::cbor::encode(*this); + return codec::cbor::encode(ProviderDealStateV1_1_0{this->state}); }; private: diff --git a/test/core/markets/storage/provider/stored_ask_test.cpp b/test/core/markets/storage/provider/stored_ask_test.cpp index 6d5a1aee25..1138fcd96b 100644 --- a/test/core/markets/storage/provider/stored_ask_test.cpp +++ b/test/core/markets/storage/provider/stored_ask_test.cpp @@ -7,7 +7,6 @@ #include #include "crypto/bls/impl/bls_provider_impl.hpp" -#include "crypto/secp256k1/impl/secp256k1_sha256_provider_impl.hpp" #include "storage/in_memory/in_memory_storage.hpp" #include "testutil/literals.hpp" #include "testutil/outcome.hpp" @@ -20,8 +19,6 @@ namespace fc::markets::storage::provider { using fc::crypto::bls::BlsProvider; using fc::crypto::bls::BlsProviderImpl; using fc::crypto::bls::KeyPair; - using fc::crypto::secp256k1::Secp256k1ProviderDefault; - using fc::crypto::secp256k1::Secp256k1Sha256ProviderImpl; using fc::storage::InMemoryStorage; using BlsSignature = fc::crypto::bls::Signature; @@ -29,8 +26,6 @@ namespace fc::markets::storage::provider { public: std::shared_ptr bls_provider_ = std::make_shared(); - std::shared_ptr secp256k1_provider_ = - std::make_shared(); std::shared_ptr datastore = std::make_shared(); @@ -110,6 +105,7 @@ namespace fc::markets::storage::provider { EXPECT_OUTCOME_TRUE(ask, stored_ask.getAsk(actor_address)); EXPECT_EQ(ask.ask.price, kDefaultPrice); + EXPECT_EQ(ask.ask.verified_price, kDefaultPrice); EXPECT_EQ(ask.ask.min_piece_size, kDefaultMinPieceSize); EXPECT_EQ(ask.ask.max_piece_size, kDefaultMaxPieceSize); EXPECT_EQ(ask.ask.miner, actor_address);