Restructure directory for clarity

.github/workflows/ci.yml

@@ -3,7 +3,9 @@ name: CI
 on:
   pull_request:
     paths:
-      contract/Xorshift128plus.cdc
+      - contract/Xorshift128plus.cdc
+      - prg_test.go
+      - prg_test_helpers.go
 
 jobs:
   build:

contracts/CoinToss.cdc

@@ -69,7 +69,7 @@ access(all) contract CoinToss {
         let receiptID = receipt.uuid
 
         // self.randomCoin() errors if commitBlock <= current block height in call to
-		// RandomBeaconHistory.sourceOfRandomness()
+        // RandomBeaconHistory.sourceOfRandomness()
         let coin = self.randomCoin(atBlockHeight: receipt.commitBlock, salt: receipt.uuid)
 
         destroy receipt

flow.json

@@ -8,48 +8,48 @@
 			}
 		},
 		"FlowToken": {
-			"source": "./contracts/utility/FlowToken.cdc",
+			"source": "./contracts/standard/FlowToken.cdc",
 			"aliases": {
 				"emulator": "0ae53cb6e3f42a79",
 				"mainnet": "1654653399040a61",
 				"testnet": "7e60df042a9c0868"
 			}
 		},
 		"FungibleToken": {
-			"source": "./contracts/utility/FungibleToken.cdc",
+			"source": "./contracts/standard/FungibleToken.cdc",
 			"aliases": {
 				"emulator": "ee82856bf20e2aa6",
 				"mainnet": "f233dcee88fe0abe",
 				"testnet": "9a0766d93b6608b7"
 			}
 		},
 		"MetadataViews": {
-			"source": "./contracts/utility/MetadataViews.cdc",
+			"source": "./contracts/standard/MetadataViews.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"mainnet": "1d7e57aa55817448",
 				"testnet": "631e88ae7f1d7c20"
 			}
 		},
 		"NonFungibleToken": {
-			"source": "./contracts/utility/NonFungibleToken.cdc",
+			"source": "./contracts/standard/NonFungibleToken.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"mainnet": "1d7e57aa55817448",
 				"testnet": "631e88ae7f1d7c20"
 			}
 		},
 		"RandomBeaconHistory": {
-			"source": "./contracts/RandomBeaconHistory.cdc",
+			"source": "./contracts/standard/RandomBeaconHistory.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"mainnet": "e467b9dd11fa00df",
 				"testnet": "8c5303eaa26202d6"
 			}
 		},
-		"RandomResultStorage": "./contracts/utility/RandomResultStorage.cdc",
+		"RandomResultStorage": "./contracts/test/RandomResultStorage.cdc",
 		"ViewResolver": {
-			"source": "./contracts/utility/ViewResolver.cdc",
+			"source": "./contracts/standard/ViewResolver.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"mainnet": "1d7e57aa55817448",

go.mod

@@ -4,7 +4,6 @@ go 1.19
 
 require (
 	github.com/bjartek/overflow v1.14.1
-	github.com/onflow/cadence v0.42.2
 	github.com/onflow/flow-go/crypto v0.24.10
 	github.com/stretchr/testify v1.8.4
 )
@@ -108,6 +107,7 @@ require (
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/nightlyone/lockfile v1.0.0 // indirect
 	github.com/onflow/atree v0.6.0 // indirect
+	github.com/onflow/cadence v0.42.2 // indirect
 	github.com/onflow/flow-cli/flowkit v1.4.5 // indirect
 	github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20230703193002-53362441b57d // indirect
 	github.com/onflow/flow-core-contracts/lib/go/templates v1.2.3 // indirect

prg_test_helpers.go

@@ -36,10 +36,10 @@ func GetNextUInt64NewPRGWithSalt(
 
 	var value uint64
 	err := o.Script(
-		"xorshift128plus/next_uint64",
+		"test/next_uint64",
 		WithArg("sourceOfRandomness", seed),
 		WithArg("salt", salt),
-	).MarshalAs(value)
+	).MarshalAs(&value)
 
 	require.NoError(t, err)
 
@@ -54,7 +54,7 @@ func GetResultsFromRandomResultStorage(
 ) []uint64 {
 	t.Helper()
 	var uint64Array []uint64
-	err := o.Script("random-result-storage/get_results").MarshalAs(uint64Array)
+	err := o.Script("test/get_results").MarshalAs(&uint64Array)
 	require.NoError(t, err)
 	return uint64Array
 }
@@ -70,10 +70,10 @@ func GetResultsInRangeFromRandomResultStorage(
 
 	var uint64Array []uint64
 	err := o.Script(
-		"random-result-storage/get_results_in_range",
+		"test/get_results_in_range",
 		WithArg("from", from),
 		WithArg("upTo", upTo),
-	).MarshalAs(uint64Array)
+	).MarshalAs(&uint64Array)
 	require.NoError(t, err)
 
 	return uint64Array
@@ -89,7 +89,7 @@ func GenerateResultsAndStore(
 ) {
 	t.Helper()
 	o.Tx(
-		"random-result-storage/generate_results",
+		"test/generate_results",
 		WithSignerServiceAccount(),
 		WithArg("generationLength", length),
 	).AssertSuccess(t)
@@ -104,7 +104,7 @@ func InitializePRG(
 ) {
 	t.Helper()
 	o.Tx(
-		"random-result-storage/initialize_prg",
+		"test/initialize_prg",
 		WithSignerServiceAccount(),
 		WithArg("sourceOfRandomness", seed),
 		WithArg("salt", salt),

scripts/xorshift128plus/next_uint64.cdc → scripts/test/next_uint64.cdc

@@ -4,6 +4,6 @@ import "Xorshift128plus"
 ///
 /// Note that if the PRG were stored onchain, this script would not advance the state of the PRG
 ///
-pub fun main(sourceOfRandomness: [UInt8], salt: [UInt8]): UInt64 {
+access(all) fun main(sourceOfRandomness: [UInt8], salt: [UInt8]): UInt64 {
     return Xorshift128plus.PRG(sourceOfRandomness: sourceOfRandomness, salt: salt).nextUInt64()
 }