Move master branch to main branch

dedis · Apr 30, 2021 · 0299bcd · 0299bcd
1 parent 910cab3
commit 0299bcd
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/PUBLISH.md b/PUBLISH.md
@@ -24,7 +24,7 @@ Tag the release using
 git tag -s vX.Y.Z -m "Cothority Release vX.Y.Z"
 ```
 
-and push it to master with `git push origin vX.Y.Z`. A tag push triggers
+and push it to `main` with `git push origin vX.Y.Z`. A tag push triggers
 the `release` action workflow which releases new binaries in
 `https://github.com/dedis/cothority/releases/tag/vX.Y.Z`. Please make sure to
 add the release description by editing that page.
@@ -61,7 +61,7 @@ git push --tags origin
 
 To publish a new release of `@dedis/cothority`:
 1. update the cothority-version and (if needed) the kyber dependency version in
-   `cothority/package.json`, commit and push to master
+   `cothority/package.json`, commit and push to `main`
 1. publish the new cothority-npm using `cothority/publish.sh`
 1. create a signed and annotated tag on the latest commit (adjust with the
    updated version):

diff --git a/bevm/bevmclient/README.md b/bevm/bevmclient/README.md
@@ -1,15 +1,15 @@
 Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
 [Cothority](../README.md) ::
 [Building Blocks](../doc/BuildingBlocks.md) ::
-[BEvm](https://github.com/dedis/cothority/blob/master/bevm/README.md) ::
+[BEvm](https://github.com/dedis/cothority/blob/main/bevm/README.md) ::
 bevmclient
 
 # bevmclient - CLI tool to deploy and interact with BEvm contracts
 
 For the details on all the options and arguments, invoke the tool using the `--help` option.
 
 ## Creating a BEvm account
-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):
+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):
 ```bash
 bevmclient createAccount --accountName <MyAccount>
 ```

diff --git a/blscosi/simulation/simul.go b/blscosi/simulation/simul.go
@@ -2,7 +2,7 @@
 // needed to run it.
 //
 // Please see
-// https://github.com/dedis/cothority/blob/master/blscosi/simulation/README.md
+// https://github.com/dedis/cothority/blob/main/blscosi/simulation/README.md
 // for instruction on how to run the simulation.
 package main
 

diff --git a/byzcoin/Contracts.md b/byzcoin/Contracts.md
@@ -1,6 +1,6 @@
 Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
-[Cothority](https://github.com/dedis/cothority/tree/master/README.md) ::
-[Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) ::
+[Cothority](https://github.com/dedis/cothority/tree/main/README.md) ::
+[Building Blocks](https://github.com/dedis/cothority/tree/main/doc/BuildingBlocks.md) ::
 [ByzCoin](README.md) ::
 Contracts and Instances
 

diff --git a/byzcoin/README.md b/byzcoin/README.md
@@ -1,6 +1,6 @@
 Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
-[Cothority](https://github.com/dedis/cothority/tree/master/README.md) ::
-[Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) ::
+[Cothority](https://github.com/dedis/cothority/tree/main/README.md) ::
+[Building Blocks](https://github.com/dedis/cothority/tree/main/doc/BuildingBlocks.md) ::
 ByzCoin
 
 # ByzCoin

diff --git a/byzcoin/RosterChange.md b/byzcoin/RosterChange.md
@@ -1,7 +1,7 @@
 Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
-[Cothority](https://github.com/dedis/cothority/tree/master/README.md) ::
-[Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) ::
-[ByzCoin](https://github.com/dedis/cothority/tree/master/byzcoin/README.md) ::
+[Cothority](https://github.com/dedis/cothority/tree/main/README.md) ::
+[Building Blocks](https://github.com/dedis/cothority/tree/main/doc/BuildingBlocks.md) ::
+[ByzCoin](https://github.com/dedis/cothority/tree/main/byzcoin/README.md) ::
 RosterChange
 
 # Roster Change

diff --git a/calypso/protocol/doc.go b/calypso/protocol/doc.go
@@ -2,5 +2,5 @@
 // the onchain-secrets (ocs) protocol.
 //
 // Please see the README for more details -
-// https://github.com/dedis/cothority/blob/master/calypso/protocol/README.md.
+// https://github.com/dedis/cothority/blob/main/calypso/protocol/README.md.
 package protocol
diff --git a/calypso/service.go b/calypso/service.go
@@ -6,7 +6,7 @@
 // distributed key and to request a re-encryption
 //
 // For more details, see
-// https://github.com/dedis/cothority/tree/master/calypso/README.md
+// https://github.com/dedis/cothority/tree/main/calypso/README.md
 //
 // There are two contracts implemented by this package:
 //

diff --git a/conode/README.md b/conode/README.md
@@ -377,9 +377,9 @@ it is now running on a different underlying server.
 
 Note: The address part of a server identity has name resolution applied to it.
 Thus it would be possible to set the roster of a skipchain to include a server
-identity like "tcp://conode-master.example.com:6979" and then change the
-definition of conode-master.example.com in DNS to change the IP address
-of the master.
+identity like "tcp://conode-main.example.com:6979" and then change the
+definition of conode-main.example.com in DNS to change the IP address
+of the main.
 
 ## Verifying your server
 

diff --git a/cosi/simulation/simul.go b/cosi/simulation/simul.go
@@ -2,7 +2,7 @@
 // to run it.
 //
 // Please see
-// https://github.com/dedis/cothority/blob/master/cosi/simulation/README.md for
+// https://github.com/dedis/cothority/blob/main/cosi/simulation/README.md for
 // instruction on how to run the simulation.
 package main
 

diff --git a/darc/README.md b/darc/README.md
@@ -1,6 +1,6 @@
 Navigation: [DEDIS](https://github.com/dedis/doc/tree/master/README.md) ::
-[Cothority](https://github.com/dedis/cothority/tree/master/README.md) ::
-[Building Blocks](https://github.com/dedis/cothority/tree/master/doc/BuildingBlocks.md) ::
+[Cothority](https://github.com/dedis/cothority/tree/main/README.md) ::
+[Building Blocks](https://github.com/dedis/cothority/tree/main/doc/BuildingBlocks.md) ::
 [ByzCoin](../README.md)
 Distributed Access Right Controls
 

diff --git a/doc.go b/doc.go
@@ -11,7 +11,7 @@
 // protocols who make conodes work together.
 //
 // For further documentation, please go to
-// https://github.com/dedis/cothority/blob/master/README.md.
+// https://github.com/dedis/cothority/blob/main/README.md.
 //
 // Some examples of what you can do with a cothority:
 // (1) https://pulsar.dedis.ch,

diff --git a/skipchain/skipchain_test.go b/skipchain/skipchain_test.go
@@ -811,13 +811,13 @@ func TestService_AddFollow(t *testing.T) {
 	sig, err = schnorr.Sign(cothority.Suite, priv0, ssb.NewBlock.CalculateHash())
 	require.NoError(t, err)
 	ssb.Signature = &sig
-	master0, err := service.StoreSkipBlock(ssb)
+	main0, err := service.StoreSkipBlock(ssb)
 	require.NoError(t, err)
 
 	// Not fully authenticated roster
 	log.Lvl2("2nd roster is not registered")
 	services[1].Storage.FollowIDs = []SkipBlockID{[]byte{0}}
-	ssb.TargetSkipChainID = master0.Latest.Hash
+	ssb.TargetSkipChainID = main0.Latest.Hash
 	sb = sb.Copy()
 	ssb.NewBlock = sb
 	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) {
 	// make other services follow skipchain
 	log.Lvl2("correct 2 node signing")
 	services[1].Storage.Follow = []FollowChainType{{
-		Block:    master0.Latest,
+		Block:    main0.Latest,
 		NewChain: NewChainAnyNode,
 		closing:  make(chan bool),
 	}}
 	sig, err = schnorr.Sign(cothority.Suite, priv0, ssb.NewBlock.CalculateHash())
 	require.NoError(t, err)
 	ssb.Signature = &sig
-	master1, err := service.StoreSkipBlock(ssb)
+	main1, err := service.StoreSkipBlock(ssb)
 	require.NoError(t, err)
 
 	// update skipblock and follow the skipblock
 	log.Lvl2("3 node signing with block update")
 	services[2].Storage.Follow = []FollowChainType{{
-		Block:    master0.Latest,
+		Block:    main0.Latest,
 		NewChain: NewChainAnyNode,
 		closing:  make(chan bool),
 	}}
 	sb = sb.Copy()
 	sb.Roster = onet.NewRoster([]*network.ServerIdentity{ro.List[1], ro.List[0], ro.List[2]})
 	sb.Hash = sb.CalculateHash()
 	ssb.NewBlock = sb
-	ssb.TargetSkipChainID = master1.Latest.Hash
+	ssb.TargetSkipChainID = main1.Latest.Hash
 	sig, err = schnorr.Sign(cothority.Suite, priv1, ssb.NewBlock.CalculateHash())
 	require.NoError(t, err)
 	ssb.Signature = &sig
@@ -862,9 +862,9 @@ func TestService_AddFollow(t *testing.T) {
 	for _, sb := range sbs {
 		services[1].db.Store(sb)
 	}
-	master2, err := services[1].StoreSkipBlock(ssb)
+	main2, err := services[1].StoreSkipBlock(ssb)
 	require.NoError(t, err)
-	require.True(t, services[1].db.GetByID(master1.Latest.Hash).ForwardLink[0].To.Equal(master2.Latest.Hash))
+	require.True(t, services[1].db.GetByID(main1.Latest.Hash).ForwardLink[0].To.Equal(main2.Latest.Hash))
 }
 
 func TestService_CreateLinkPrivate(t *testing.T) {