Skip to content

Commit 4fa4b0c

Browse files
HarrmHarrm
committed
rename jam to morum
1 parent 1c0bad2 commit 4fa4b0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+190
-190
lines changed

‎scripts/asn1.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,11 @@ def asn_sequence_of(t):
187187
if type(size) is int:
188188
return "qtils::BytesN<%u>" % size
189189
else:
190-
return "::jam::ConfigVec<uint8_t, Config::Field::%s>" % c_dash(size)
190+
return "::morum::ConfigVec<uint8_t, Config::Field::%s>" % c_dash(size)
191191
return "qtils::Bytes"
192192
if fixed:
193193
if isinstance(size, str):
194-
return "::jam::ConfigVec<%s, Config::Field::%s>" % (T, c_dash(size))
194+
return "::morum::ConfigVec<%s, Config::Field::%s>" % (T, c_dash(size))
195195
return "std::array<%s, %s>" % (T, c_dash(size))
196196
return "std::vector<%s>" % T
197197

@@ -497,23 +497,23 @@ def write(self, name: str):
497497

498498
def constants():
499499
g = GenConstants(
500-
"jam::test_vectors",
500+
"morum::test_vectors",
501501
"jam-types-asn",
502502
)
503503
g.write()
504504

505505

506506
def types():
507507
g = GenCommonTypes(
508-
"jam::test_vectors",
508+
"morum::test_vectors",
509509
"jam-types-asn",
510510
)
511511
g.write()
512512

513513

514514
def history():
515515
g = GenSpecialTypes(
516-
"jam::test_vectors",
516+
"morum::test_vectors",
517517
"history",
518518
"history/history",
519519
"HistoryModule",
@@ -523,7 +523,7 @@ def history():
523523

524524
def safrole():
525525
g = GenSpecialTypes(
526-
"jam::test_vectors",
526+
"morum::test_vectors",
527527
"safrole",
528528
"safrole/safrole",
529529
"SafroleModule",
@@ -533,7 +533,7 @@ def safrole():
533533

534534
def disputes():
535535
g = GenSpecialTypes(
536-
"jam::test_vectors",
536+
"morum::test_vectors",
537537
"disputes",
538538
"disputes/disputes",
539539
"DisputesModule",
@@ -543,7 +543,7 @@ def disputes():
543543

544544
def authorizations():
545545
g = GenSpecialTypes(
546-
"jam::test_vectors",
546+
"morum::test_vectors",
547547
"authorizations",
548548
"authorizations/authorizations",
549549
"AuthorizationsModule",

‎src/app/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ add_custom_command(
1010
OUTPUT ${BUILD_VERSION_CPP}
1111
COMMAND echo "// Auto-generated file\n" > ${BUILD_VERSION_CPP}
1212
COMMAND echo "#include <string>\n" >> ${BUILD_VERSION_CPP}
13-
COMMAND echo "namespace jam {" >> ${BUILD_VERSION_CPP}
13+
COMMAND echo "namespace morum {" >> ${BUILD_VERSION_CPP}
1414
COMMAND echo " const std::string &buildVersion() {" >> ${BUILD_VERSION_CPP}
1515
COMMAND printf " static const std::string buildVersion(\"" >> ${BUILD_VERSION_CPP}
1616
COMMAND ${GET_VERSION_SCRIPT} >> ${BUILD_VERSION_CPP}

‎src/app/application.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <utils/ctor_limiters.hpp>
1010

11-
namespace jam::app {
11+
namespace morum::app {
1212

1313
/// @class Application - JAM-application interface
1414
class Application : private Singleton<Application> {
@@ -19,4 +19,4 @@ namespace jam::app {
1919
virtual void run() = 0;
2020
};
2121

22-
} // namespace jam::app
22+
} // namespace morum::app

‎src/app/build_version.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
#include <string>
1010

11-
namespace jam {
11+
namespace morum {
1212
/**
1313
* @returns String indicating current build version. Might to contain: tag,
1414
* number of commits from tag to fork, commit branch and number of commits
1515
* from fork to current commit.
1616
* @note Definition is generating by cmake
1717
*/
1818
const std::string &buildVersion();
19-
} // namespace jam
19+
} // namespace morum

‎src/app/configuration.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "app/configuration.hpp"
77

8-
namespace jam::app {
8+
namespace morum::app {
99

1010
Configuration::Configuration()
1111
: version_("undefined"), name_("unnamed"), metrics_endpoint_() {}
@@ -23,4 +23,4 @@ namespace jam::app {
2323
return metrics_endpoint_;
2424
}
2525

26-
} // namespace jam::app
26+
} // namespace morum::app

‎src/app/configuration.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <boost/asio/ip/tcp.hpp>
1111
#include <utils/ctor_limiters.hpp>
1212

13-
namespace jam::app {
13+
namespace morum::app {
1414
class Configuration final : Singleton<Configuration> {
1515
public:
1616
using Endpoint = boost::asio::ip::tcp::endpoint;
@@ -34,4 +34,4 @@ namespace jam::app {
3434
std::optional<bool> metrics_enabled_;
3535
};
3636

37-
} // namespace jam::app
37+
} // namespace morum::app

‎src/app/configurator.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
using Endpoint = boost::asio::ip::tcp::endpoint;
2222

23-
OUTCOME_CPP_DEFINE_CATEGORY(jam::app, Configurator::Error, e) {
24-
using E = jam::app::Configurator::Error;
23+
OUTCOME_CPP_DEFINE_CATEGORY(morum::app, Configurator::Error, e) {
24+
using E = morum::app::Configurator::Error;
2525
switch (e) {
2626
case E::CliArgsParseFailed:
2727
return "CLI Arguments parse failed";
@@ -67,7 +67,7 @@ namespace {
6767
}
6868
} // namespace
6969

70-
namespace jam::app {
70+
namespace morum::app {
7171

7272
Configurator::Configurator(int argc, const char **argv, const char **env)
7373
: argc_(argc), argv_(argv), env_(env) {
@@ -365,4 +365,4 @@ namespace jam::app {
365365
return outcome::success();
366366
}
367367

368-
} // namespace jam::app
368+
} // namespace morum::app

‎src/app/configurator.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ namespace soralog {
1616
class Logger;
1717
} // namespace soralog
1818

19-
namespace jam::app {
19+
namespace morum::app {
2020
class Configuration;
21-
} // namespace jam::app
21+
} // namespace morum::app
2222

23-
namespace jam::app {
23+
namespace morum::app {
2424

2525
class Configurator final {
2626
public:
@@ -70,6 +70,6 @@ namespace jam::app {
7070
boost::program_options::variables_map cli_values_map_;
7171
};
7272

73-
} // namespace jam::app
73+
} // namespace morum::app
7474

75-
OUTCOME_HPP_DECLARE_ERROR(jam::app, Configurator::Error);
75+
OUTCOME_HPP_DECLARE_ERROR(morum::app, Configurator::Error);

‎src/app/impl/application_impl.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "metrics/histogram_timer.hpp"
1818
#include "metrics/metrics.hpp"
1919

20-
namespace jam::app {
20+
namespace morum::app {
2121

2222
ApplicationImpl::ApplicationImpl(
2323
std::shared_ptr<log::LoggingSystem> logsys,
@@ -70,4 +70,4 @@ namespace jam::app {
7070
watchdog_thread.join();
7171
}
7272

73-
} // namespace jam::app
73+
} // namespace morum::app

‎src/app/impl/application_impl.hpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@
1212

1313
#include <metrics/registry.hpp>
1414

15-
namespace jam {
15+
namespace morum {
1616
class Watchdog;
17-
} // namespace jam
17+
} // namespace morum
1818

19-
namespace jam::app {
19+
namespace morum::app {
2020
class Configuration;
2121
class StateManager;
22-
} // namespace jam::app
22+
} // namespace morum::app
2323

24-
namespace jam::clock {
24+
namespace morum::clock {
2525
class SystemClock;
26-
} // namespace jam::clock
26+
} // namespace morum::clock
2727

2828
namespace soralog {
2929
class Logger;
3030
} // namespace soralog
3131

32-
namespace jam::log {
32+
namespace morum::log {
3333
class LoggingSystem;
34-
} // namespace jam::log
34+
} // namespace morum::log
3535

36-
namespace jam::metrics {
36+
namespace morum::metrics {
3737
class Registry;
3838
class Gauge;
3939
class Exposer;
40-
} // namespace jam::metrics
40+
} // namespace morum::metrics
4141

42-
namespace jam::app {
42+
namespace morum::app {
4343

4444
class ApplicationImpl final : public Application {
4545
public:
@@ -64,4 +64,4 @@ namespace jam::app {
6464
std::unique_ptr<metrics::Registry> metrics_registry_;
6565
};
6666

67-
} // namespace jam::app
67+
} // namespace morum::app

‎src/app/impl/state_manager_impl.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "log/logger.hpp"
1313

14-
namespace jam::app {
14+
namespace morum::app {
1515
std::weak_ptr<StateManagerImpl> StateManagerImpl::wp_to_myself;
1616

1717
std::atomic_bool StateManagerImpl::shutting_down_signals_enabled{false};
@@ -281,4 +281,4 @@ namespace jam::app {
281281
state_.store(State::ShuttingDown);
282282
cv_.notify_one();
283283
}
284-
} // namespace jam::app
284+
} // namespace morum::app

‎src/app/impl/state_manager_impl.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
namespace soralog {
1919
class Logger;
2020
} // namespace soralog
21-
namespace jam::log {
21+
namespace morum::log {
2222
class LoggingSystem;
23-
} // namespace jam::log
23+
} // namespace morum::log
2424

25-
namespace jam::app {
25+
namespace morum::app {
2626

2727
class StateManagerImpl final
2828
: Singleton<StateManager>,
@@ -81,4 +81,4 @@ namespace jam::app {
8181
std::queue<OnShutdown> shutdown_;
8282
};
8383

84-
} // namespace jam::app
84+
} // namespace morum::app

‎src/app/impl/watchdog.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ namespace soralog {
2727
class Logger;
2828
} // namespace soralog
2929

30-
namespace jam::log {
30+
namespace morum::log {
3131
class LoggingSystem;
32-
} // namespace jam::log
32+
} // namespace morum::log
3333

3434
#ifdef __APPLE__
3535

@@ -64,7 +64,7 @@ inline uint64_t getPlatformThreadId() {
6464

6565
#endif
6666

67-
namespace jam {
67+
namespace morum {
6868

6969
constexpr auto kWatchdogDefaultTimeout = std::chrono::minutes{15};
7070

@@ -183,4 +183,4 @@ namespace jam {
183183
std::unordered_map<std::thread::id, Thread> threads_;
184184
std::atomic_bool stopped_ = false;
185185
};
186-
} // namespace jam
186+
} // namespace morum

‎src/app/state_manager.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <stdexcept>
1212
#include <string>
1313

14-
namespace jam::app {
14+
namespace morum::app {
1515

1616
// Concepts that check if an object has a method that is called by app state
1717
// manager. Deliberately avoid checking that the method returns bool,
@@ -127,4 +127,4 @@ namespace jam::app {
127127
explicit AppStateException(std::string message)
128128
: std::runtime_error("Wrong workflow at " + std::move(message)) {}
129129
};
130-
} // namespace jam::app
130+
} // namespace morum::app

‎src/clock/clock.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <chrono>
1010

11-
namespace jam::clock {
11+
namespace morum::clock {
1212

1313
/**
1414
* An interface for a clock
@@ -63,4 +63,4 @@ namespace jam::clock {
6363
*/
6464
class SteadyClock : public virtual Clock<std::chrono::steady_clock> {};
6565

66-
} // namespace jam::clock
66+
} // namespace morum::clock

‎src/clock/impl/clock_impl.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "clock/impl/clock_impl.hpp"
88

9-
namespace jam::clock {
9+
namespace morum::clock {
1010

1111
template <typename ClockType>
1212
typename Clock<ClockType>::TimePoint ClockImpl<ClockType>::now() const {
@@ -30,4 +30,4 @@ namespace jam::clock {
3030
template class ClockImpl<std::chrono::steady_clock>;
3131
template class ClockImpl<std::chrono::system_clock>;
3232

33-
} // namespace jam::clock
33+
} // namespace morum::clock

‎src/clock/impl/clock_impl.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "clock/clock.hpp"
1010

11-
namespace jam::clock {
11+
namespace morum::clock {
1212

1313
template <typename ClockType>
1414
class ClockImpl : virtual public Clock<ClockType> {
@@ -23,4 +23,4 @@ namespace jam::clock {
2323
class SteadyClockImpl : public SteadyClock,
2424
public ClockImpl<std::chrono::steady_clock> {};
2525

26-
} // namespace jam::clock
26+
} // namespace morum::clock

‎src/crypto/bandersnatch.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <jam_crust.h>
1313
#include <qtils/bytes.hpp>
1414

15-
namespace jam::crypto::bandersnatch {
15+
namespace morum::crypto::bandersnatch {
1616
using Output = qtils::BytesN<JAM_BANDERSNATCH_OUTPUT>;
1717
using Public = qtils::BytesN<JAM_BANDERSNATCH_PUBLIC>;
1818
using RingCommitment = qtils::BytesN<JAM_BANDERSNATCH_RING_COMMITMENT>;
@@ -91,4 +91,4 @@ namespace jam::crypto::bandersnatch {
9191
RingVerifier Ring::verifier(const RingCommitment &commitment) const {
9292
return RingVerifier{*this, commitment};
9393
}
94-
} // namespace jam::bandersnatch
94+
} // namespace morum::bandersnatch

0 commit comments

Comments
 (0)