Fixed merge

This commit is contained in:
MoneroOcean
2024-10-07 07:33:17 +03:00
parent 20c20f5522
commit 1c06a70b58

View File

@@ -220,7 +220,7 @@ namespace zephyr_oracle
uint64_t timestamp; uint64_t timestamp;
unsigned char signature[64]; unsigned char signature[64];
bool write_to_pr(oracle::pricing_record &pr) bool write_to_pr(zephyr_oracle::pricing_record &pr)
{ {
pr.spot = spot; pr.spot = spot;
pr.moving_average = moving_average; pr.moving_average = moving_average;
@@ -236,7 +236,7 @@ namespace zephyr_oracle
return true; return true;
}; };
bool read_from_pr(oracle::pricing_record &pr) bool read_from_pr(zephyr_oracle::pricing_record &pr)
{ {
spot = pr.spot; spot = pr.spot;
moving_average = pr.moving_average; moving_average = pr.moving_average;