Skip to content

Commit 0299bcd

Browse files
ineitiineiti
committed
Move master branch to main branch
1 parent 910cab3 commit 0299bcd

File tree

13 files changed

+29
-29
lines changed

13 files changed

+29
-29
lines changed

‎PUBLISH.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Tag the release using
2424
git tag -s vX.Y.Z -m "Cothority Release vX.Y.Z"
2525
```
2626

27-
and push it to master with `git push origin vX.Y.Z`. A tag push triggers
27+
and push it to `main` with `git push origin vX.Y.Z`. A tag push triggers
2828
the `release` action workflow which releases new binaries in
2929
`https://github.com/dedis/cothority/releases/tag/vX.Y.Z`. Please make sure to
3030
add the release description by editing that page.
@@ -61,7 +61,7 @@ git push --tags origin
6161

6262
To publish a new release of `@dedis/cothority`:
6363
1. update the cothority-version and (if needed) the kyber dependency version in
64-
`cothority/package.json`, commit and push to master
64+
`cothority/package.json`, commit and push to `main`
6565
1. publish the new cothority-npm using `cothority/publish.sh`
6666
1. create a signed and annotated tag on the latest commit (adjust with the
6767
updated version):

‎bevm/bevmclient/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
22
[Cothority](../README.md) ::
33
[Building Blocks](../doc/BuildingBlocks.md) ::
4-
[BEvm](https://github.com/dedis/cothority/blob/master/bevm/README.md) ::
4+
[BEvm](https://github.com/dedis/cothority/blob/main/bevm/README.md) ::
55
bevmclient
66

77
# bevmclient - CLI tool to deploy and interact with BEvm contracts
88

99
For the details on all the options and arguments, invoke the tool using the `--help` option.
1010

1111
## Creating a BEvm account
12-
Assuming ByzCoin config and key files in the current directory (see [bcadmin](https://github.com/dedis/cothority/blob/master/byzcoin/bcadmin/README.md) for details):
12+
Assuming ByzCoin config and key files in the current directory (see [bcadmin](https://github.com/dedis/cothority/blob/main/byzcoin/bcadmin/README.md) for details):
1313
```bash
1414
bevmclient createAccount --accountName <MyAccount>
1515
```

‎blscosi/simulation/simul.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// needed to run it.
33
//
44
// Please see
5-
// https://github.com/dedis/cothority/blob/master/blscosi/simulation/README.md
5+
// https://github.com/dedis/cothority/blob/main/blscosi/simulation/README.md
66
// for instruction on how to run the simulation.
77
package main
88

‎byzcoin/Contracts.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
2-
[Cothority](https://github.com/dedis/cothority/tree/master/README.md) ::
3-
[Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) ::
2+
[Cothority](https://github.com/dedis/cothority/tree/main/README.md) ::
3+
[Building Blocks](https://github.com/dedis/cothority/tree/main/doc/BuildingBlocks.md) ::
44
[ByzCoin](README.md) ::
55
Contracts and Instances
66

‎byzcoin/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
2-
[Cothority](https://github.com/dedis/cothority/tree/master/README.md) ::
3-
[Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) ::
2+
[Cothority](https://github.com/dedis/cothority/tree/main/README.md) ::
3+
[Building Blocks](https://github.com/dedis/cothority/tree/main/doc/BuildingBlocks.md) ::
44
ByzCoin
55

66
# ByzCoin

‎byzcoin/RosterChange.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
2-
[Cothority](https://github.com/dedis/cothority/tree/master/README.md) ::
3-
[Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) ::
4-
[ByzCoin](https://github.com/dedis/cothority/tree/master/byzcoin/README.md) ::
2+
[Cothority](https://github.com/dedis/cothority/tree/main/README.md) ::
3+
[Building Blocks](https://github.com/dedis/cothority/tree/main/doc/BuildingBlocks.md) ::
4+
[ByzCoin](https://github.com/dedis/cothority/tree/main/byzcoin/README.md) ::
55
RosterChange
66

77
# Roster Change

‎calypso/protocol/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// the onchain-secrets (ocs) protocol.
33
//
44
// Please see the README for more details -
5-
// https://github.com/dedis/cothority/blob/master/calypso/protocol/README.md.
5+
// https://github.com/dedis/cothority/blob/main/calypso/protocol/README.md.
66
package protocol

‎calypso/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// distributed key and to request a re-encryption
77
//
88
// For more details, see
9-
// https://github.com/dedis/cothority/tree/master/calypso/README.md
9+
// https://github.com/dedis/cothority/tree/main/calypso/README.md
1010
//
1111
// There are two contracts implemented by this package:
1212
//

‎conode/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,9 @@ it is now running on a different underlying server.
377377

378378
Note: The address part of a server identity has name resolution applied to it.
379379
Thus it would be possible to set the roster of a skipchain to include a server
380-
identity like "tcp://conode-master.example.com:6979" and then change the
381-
definition of conode-master.example.com in DNS to change the IP address
382-
of the master.
380+
identity like "tcp://conode-main.example.com:6979" and then change the
381+
definition of conode-main.example.com in DNS to change the IP address
382+
of the main.
383383

384384
## Verifying your server
385385

‎cosi/simulation/simul.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// to run it.
33
//
44
// Please see
5-
// https://github.com/dedis/cothority/blob/master/cosi/simulation/README.md for
5+
// https://github.com/dedis/cothority/blob/main/cosi/simulation/README.md for
66
// instruction on how to run the simulation.
77
package main
88

‎darc/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
2-
[Cothority](https://github.com/dedis/cothority/tree/master/README.md) ::
3-
[Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) ::
2+
[Cothority](https://github.com/dedis/cothority/tree/main/README.md) ::
3+
[Building Blocks](https://github.com/dedis/cothority/tree/main/doc/BuildingBlocks.md) ::
44
[ByzCoin](../README.md)
55
Distributed Access Right Controls
66

‎doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// protocols who make conodes work together.
1212
//
1313
// For further documentation, please go to
14-
// https://github.com/dedis/cothority/blob/master/README.md.
14+
// https://github.com/dedis/cothority/blob/main/README.md.
1515
//
1616
// Some examples of what you can do with a cothority:
1717
// (1) https://pulsar.dedis.ch,

‎skipchain/skipchain_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -811,13 +811,13 @@ func TestService_AddFollow(t *testing.T) {
811811
sig, err = schnorr.Sign(cothority.Suite, priv0, ssb.NewBlock.CalculateHash())
812812
require.NoError(t, err)
813813
ssb.Signature = &sig
814-
master0, err := service.StoreSkipBlock(ssb)
814+
main0, err := service.StoreSkipBlock(ssb)
815815
require.NoError(t, err)
816816

817817
// Not fully authenticated roster
818818
log.Lvl2("2nd roster is not registered")
819819
services[1].Storage.FollowIDs = []SkipBlockID{[]byte{0}}
820-
ssb.TargetSkipChainID = master0.Latest.Hash
820+
ssb.TargetSkipChainID = main0.Latest.Hash
821821
sb = sb.Copy()
822822
ssb.NewBlock = sb
823823
sb.Roster = onet.NewRoster([]*network.ServerIdentity{ro.List[0], ro.List[1]}) // two in roster
@@ -832,28 +832,28 @@ func TestService_AddFollow(t *testing.T) {
832832
// make other services follow skipchain
833833
log.Lvl2("correct 2 node signing")
834834
services[1].Storage.Follow = []FollowChainType{{
835-
Block: master0.Latest,
835+
Block: main0.Latest,
836836
NewChain: NewChainAnyNode,
837837
closing: make(chan bool),
838838
}}
839839
sig, err = schnorr.Sign(cothority.Suite, priv0, ssb.NewBlock.CalculateHash())
840840
require.NoError(t, err)
841841
ssb.Signature = &sig
842-
master1, err := service.StoreSkipBlock(ssb)
842+
main1, err := service.StoreSkipBlock(ssb)
843843
require.NoError(t, err)
844844

845845
// update skipblock and follow the skipblock
846846
log.Lvl2("3 node signing with block update")
847847
services[2].Storage.Follow = []FollowChainType{{
848-
Block: master0.Latest,
848+
Block: main0.Latest,
849849
NewChain: NewChainAnyNode,
850850
closing: make(chan bool),
851851
}}
852852
sb = sb.Copy()
853853
sb.Roster = onet.NewRoster([]*network.ServerIdentity{ro.List[1], ro.List[0], ro.List[2]})
854854
sb.Hash = sb.CalculateHash()
855855
ssb.NewBlock = sb
856-
ssb.TargetSkipChainID = master1.Latest.Hash
856+
ssb.TargetSkipChainID = main1.Latest.Hash
857857
sig, err = schnorr.Sign(cothority.Suite, priv1, ssb.NewBlock.CalculateHash())
858858
require.NoError(t, err)
859859
ssb.Signature = &sig
@@ -862,9 +862,9 @@ func TestService_AddFollow(t *testing.T) {
862862
for _, sb := range sbs {
863863
services[1].db.Store(sb)
864864
}
865-
master2, err := services[1].StoreSkipBlock(ssb)
865+
main2, err := services[1].StoreSkipBlock(ssb)
866866
require.NoError(t, err)
867-
require.True(t, services[1].db.GetByID(master1.Latest.Hash).ForwardLink[0].To.Equal(master2.Latest.Hash))
867+
require.True(t, services[1].db.GetByID(main1.Latest.Hash).ForwardLink[0].To.Equal(main2.Latest.Hash))
868868
}
869869

870870
func TestService_CreateLinkPrivate(t *testing.T) {

0 commit comments

Comments
 (0)