Skip to content

Commit 414d0ee

Browse files
committed
rename jam to morum
1 parent 9152495 commit 414d0ee

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# IDE auxiliaries
3131
.idea
3232

33-
/build
33+
/build*
3434
/cmake-build-*
3535
/.build
3636
/.venv

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"clangd.arguments": [
3+
"--compile-commands-dir=build-clang-20-debug"
4+
]
5+
}

scripts/asn1.py

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,19 @@ def asn_sequence_of(t):
187187
if type(size) is int:
188188
return "qtils::BytesN<%u>" % size
189189
else:
190+
<<<<<<< HEAD
190191
return "::jam::ConfigVec<uint8_t, Config::Field::%s>" % c_dash(size)
191192
return "qtils::Bytes"
192193
if fixed:
193194
if isinstance(size, str):
194195
return "::jam::ConfigVec<%s, Config::Field::%s>" % (T, c_dash(size))
196+
=======
197+
return "::morum::ConfigVec<uint8_t, Config::Field::%s>" % c_dash(size)
198+
return "qtils::Bytes"
199+
if fixed:
200+
if isinstance(size, str):
201+
return "::morum::ConfigVec<%s, Config::Field::%s>" % (T, c_dash(size))
202+
>>>>>>> d6257fb (rename jam to morum)
195203
return "std::array<%s, %s>" % (T, c_dash(size))
196204
return "std::vector<%s>" % T
197205

@@ -497,23 +505,35 @@ def write(self, name: str):
497505

498506
def constants():
499507
g = GenConstants(
508+
<<<<<<< HEAD
500509
"jam::test_vectors",
510+
=======
511+
"morum::test_vectors",
512+
>>>>>>> d6257fb (rename jam to morum)
501513
"jam-types-asn",
502514
)
503515
g.write()
504516

505517

506518
def types():
507519
g = GenCommonTypes(
520+
<<<<<<< HEAD
508521
"jam::test_vectors",
522+
=======
523+
"morum::test_vectors",
524+
>>>>>>> d6257fb (rename jam to morum)
509525
"jam-types-asn",
510526
)
511527
g.write()
512528

513529

514530
def history():
515531
g = GenSpecialTypes(
532+
<<<<<<< HEAD
516533
"jam::test_vectors",
534+
=======
535+
"morum::test_vectors",
536+
>>>>>>> d6257fb (rename jam to morum)
517537
"history",
518538
"history/history",
519539
"HistoryModule",
@@ -523,7 +543,11 @@ def history():
523543

524544
def safrole():
525545
g = GenSpecialTypes(
546+
<<<<<<< HEAD
526547
"jam::test_vectors",
548+
=======
549+
"morum::test_vectors",
550+
>>>>>>> d6257fb (rename jam to morum)
527551
"safrole",
528552
"safrole/safrole",
529553
"SafroleModule",
@@ -533,7 +557,11 @@ def safrole():
533557

534558
def disputes():
535559
g = GenSpecialTypes(
560+
<<<<<<< HEAD
536561
"jam::test_vectors",
562+
=======
563+
"morum::test_vectors",
564+
>>>>>>> d6257fb (rename jam to morum)
537565
"disputes",
538566
"disputes/disputes",
539567
"DisputesModule",
@@ -543,7 +571,11 @@ def disputes():
543571

544572
def authorizations():
545573
g = GenSpecialTypes(
574+
<<<<<<< HEAD
546575
"jam::test_vectors",
576+
=======
577+
"morum::test_vectors",
578+
>>>>>>> d6257fb (rename jam to morum)
547579
"authorizations",
548580
"authorizations/authorizations",
549581
"AuthorizationsModule",

0 commit comments

Comments
 (0)